gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-06-23 02:40:25 +02:00
commit 411c5bde0d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/StorageEngine.class.php
View File

@ -58,11 +58,11 @@ class PMA_StorageEngine
{
static $storage_engines = null;
if (null !== $storage_engines) {
return $storage_engines;
if (null == $storage_engines) {
$storage_engines = PMA_DBI_fetch_result('SHOW STORAGE ENGINES', 'Engine');
}
return PMA_DBI_fetch_result('SHOW STORAGE ENGINES', 'Engine');
return $storage_engines;
}
/**
@ -88,7 +88,8 @@ class PMA_StorageEngine
foreach (PMA_StorageEngine::getStorageEngines() as $key => $details) {
if (!$offerUnavailableEngines
&& ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED')) {
&& ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED'
|| $details['Engine'] == 'PERFORMANCE_SCHEMA')) {
continue;
}