The branch, master has been updated via 5661c3e14cefe79d01ec8b049d0a8efe4905a2ba (commit) via 3b0f465ba939acf513bab03ba1c1088266d1113f (commit) from 4b75560c3b08ccdaff7cf427e747d83a6ff3ca54 (commit)

- Log ----------------------------------------------------------------- commit 5661c3e14cefe79d01ec8b049d0a8efe4905a2ba Author: Piotr Przybylski piotrprz@gmail.com Date: Thu Jun 23 00:49:01 2011 +0200

Don't offer PERFORMANCE_SCHEMA engine in table creation dialog and Operations tab

commit 3b0f465ba939acf513bab03ba1c1088266d1113f Author: Piotr Przybylski piotrprz@gmail.com Date: Thu Jun 23 00:44:42 2011 +0200

Fix StorageEngine::getStorageEngines() so it can properly cache data

-----------------------------------------------------------------------

Summary of changes: libraries/StorageEngine.class.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index 7504895..bcb4f68 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -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; }

hooks/post-receive