List:Commits« Previous MessageNext Message »
From:Marc Alff Date:July 16 2010 1:18am
Subject:bzr commit into mysql-trunk-bugfixing branch (marc.alff:3118) Bug#53617
View as plain text  
#At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-cleanup/ based on revid:marc.alff@stripped

 3118 Marc Alff	2010-07-15
      Bug#53617 Missing performance schema tables not reported in the server log at startup
      
      Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)

    modified:
      storage/perfschema/pfs_engine_table.cc
=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2010-07-16 00:50:39 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-07-16 01:18:44 +0000
@@ -108,7 +108,12 @@ void PFS_check_intact::report_error(uint
   my_vsnprintf(buff, sizeof(buff), fmt, args);
   va_end(args);
 
-  my_message(code, buff, MYF(0));
+  /*
+    This is an install/upgrade issue:
+    - do not report it in the user connection, there is none in main(),
+    - report it in the server error log.
+  */
+  sql_print_error("%s", buff);
 }
 
 /**
@@ -139,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/marc.alff@oracle.com-20100716011844-09rx70kxy0gzgfla.bundle
Thread
bzr commit into mysql-trunk-bugfixing branch (marc.alff:3118) Bug#53617Marc Alff16 Jul