bzr push into mysql-6.0-codebase-bugfixing branch (marc.alff:3881 to 3882)

[Marc Alff]

 3882 Marc Alff	2010-05-18 [merge]
      Merge mysql-next-mr-bugfixing --> mysql-6.0-codebase-bugfixing

    modified:
      storage/perfschema/pfs_engine_table.cc
 3881 Alexander Nozdrin	2010-05-17 [merge]
      Auto-merge from mysql-next-mr-bugfixing.

    modified:
      mysql-test/include/mysqld--help.inc
=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2010-05-13 12:33:29 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-05-18 06:51:57 +0000
@@ -147,6 +147,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]