bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3176) Bug#53617

[Marc Alff]

#At file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-53617/ based on revid:jonathan.perkin@stripped

 3176 Marc Alff	2010-05-13
      Bug#53617 Missing performance schema tables not reported in the server log at startup
      
      Before this fix, when the performance schema tables are missing due to a broken
      installation or upgrade, the server would start but not report missing performance schema tables.
      
      With this fix, missing tables are reported in the server error log, like for example as:
      ERROR Native table 'performance_schema'.'SETUP_TIMERS' has the wrong structure
      
      This test can not be automated: tested manually, no script provided.

    modified:
      storage/perfschema/pfs_engine_table.cc
=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2010-05-03 15:04:02 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-05-13 14:23:08 +0000
@@ -144,6 +144,9 @@ void PFS_engine_table_share::check_one_t
       m_checked= true;
     close_thread_tables(thd);
   }
+  else
+    sql_print_error(ER(ER_WRONG_NATIVE_TABLE_STRUCTURE),
+                    PERFORMANCE_SCHEMA_str.str, m_name.str);
 
   lex_end(&dummy_lex);
   thd->lex= old_lex;


Attachment: [text/bzr-bundle] bzr/[e-mail]