Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

araoxervmon · Jan 18, 2015 · cdf9a7c · cdf9a7c
2 parents 1d8d57e + 27540ea
commit cdf9a7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.3.8.0 (not yet released)
+- bug       Undefined constant PMA_DRIZZLE
 
 4.3.7.0 (2015-01-15)
 - bug #4694 js error on marking table as favorite in Safari (in private mode)

diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php
@@ -2391,6 +2391,10 @@ public function getSystemSchemas()
      */
     public function isSystemSchema($schema_name, $testForMysqlSchema = false)
     {
+        if (!defined("PMA_DRIZZLE")) {
+            define("PMA_DRIZZLE", false);
+        }
+
         return strtolower($schema_name) == 'information_schema'
             || (!PMA_DRIZZLE
                 && strtolower($schema_name) == 'performance_schema')