List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:May 18 2010 8:25am
Subject:bzr commit into mysql-6.0-codebase-bugfixing branch (aelkin:3881)
View as plain text  
#At file:///home/andrei/MySQL/BZR/mysql-6.0-codebase-bugfixing/ based on revid:aelkin@stripped

 3881 Andrei Elkin	2010-05-18 [merge]
      merging from rep

    modified:
      mysql-test/include/mysqld--help.inc
      storage/perfschema/pfs_engine_table.cc
=== modified file 'mysql-test/include/mysqld--help.inc'
--- a/mysql-test/include/mysqld--help.inc	2010-02-20 10:56:42 +0000
+++ b/mysql-test/include/mysqld--help.inc	2010-05-17 15:30:38 +0000
@@ -25,7 +25,7 @@ perl;
   while (<F>) {
     next if 1../The following groups are read/;
     # formatting, skip line consisting entirely of dashes and blanks
-    next if /^[\- ]+$/;
+    next if /^[\- ]+\s?$/;
     next if /Value \(after reading options\)/; # skip table header
     next if /^($re1) /;
     next if /^($re2)-/;

=== 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/aelkin@mysql.com-20100518082543-2km21ohmjsj2rlij.bundle
Thread
bzr commit into mysql-6.0-codebase-bugfixing branch (aelkin:3881)Andrei Elkin18 May