Merge remote-tracking branch 'origin/QA_3_5'

2012-02-16 15:58:44 +01:00 · 2012-02-16 15:58:44 +01:00 · 5ab83b7885
commit 5ab83b7885
parent f0910216cf 0934844ba2
1 changed files with 1 additions and 0 deletions
--- 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');
 }