Merge remote-tracking branch 'origin/QA_3_5'

phpmyadmin · Feb 16, 2012 · 5ab83b7 · 5ab83b7
2 parents f091021 + 0934844
commit 5ab83b7
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
@@ -1847,6 +1847,7 @@ function PMA_DBI_formatError($error_number, $error_message)
 function PMA_is_system_schema($schema_name, $test_for_mysql_schema = false)
 {
     return strtolower($schema_name) == 'information_schema'
+            || strtolower($schema_name) == 'performance_schema'
             || (PMA_DRIZZLE && strtolower($schema_name) == 'data_dictionary')
             || ($test_for_mysql_schema && !PMA_DRIZZLE && $schema_name == 'mysql');
 }