From: Marc Alff
Date: June 16 2010 12:36pm
Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3244 to 3245)
 Bug#54467
List-Archive: http://lists.mysql.com/commits/111262
X-Bug: 54467
Message-Id: <201006161236.o5GBJ5nS017822@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0814656783819907307=="

--===============0814656783819907307==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3245 Marc Alff	2010-06-15
      Bug#54467 performance schema complains of wrong structure in bootstrap mode
      
      Prior to this fix, the installation script:
      - did print [Note] messages in the server log,
        related to the performance schema.
      
      - did print [ERROR] messages in the server log,
        complaining about performance schema tables.
        These errors are not justified during bootstrap.
      
      With this fix:
      - notes are no longer printed,
        this reduces the server verbosity.
      
      - integrity checks for the performance schema tables
        are not performed when tables are not expected to be there,
        to avoid un justified [ERROR] messages.
      
      Tested the mysql_install_db script manually:
      
      Installing MySQL system tables...
      OK
      Filling help tables...
      OK

    modified:
      sql/mysqld.cc
 3244 Alexander Nozdrin	2010-06-15 [merge]
      Auto-merge (empty) from mysql-trunk-bugfixing.

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-06-04 20:20:13 +0000
+++ b/sql/mysqld.cc	2010-06-15 19:06:04 +0000
@@ -782,7 +782,15 @@ void Buffered_log::print()
     sql_print_warning("Buffered warning: %s\n", m_message.c_ptr_safe());
     break;
   case INFORMATION_LEVEL:
-    sql_print_information("Buffered information: %s\n", m_message.c_ptr_safe());
+    /*
+      Messages printed as "information" still end up in the mysqld *error* log,
+      but with a [Note] tag instead of an [ERROR] tag.
+      While this is probably fine for a human reading the log,
+      it is upsetting existing automated scripts used to parse logs,
+      because such scripts are likely to not already handle [Note] properly.
+      INFORMATION_LEVEL messages are simply silenced, on purpose,
+      to avoid un needed verbosity.
+    */
     break;
   }
 }
@@ -4540,16 +4548,6 @@ int mysqld_main(int argc, char **argv)
         buffered_logs.buffer(WARNING_LEVEL,
                              "Performance schema disabled (reason: init failed).");
       }
-      else
-      {
-        buffered_logs.buffer(INFORMATION_LEVEL,
-                             "Performance schema enabled.");
-      }
-    }
-    else
-    {
-      buffered_logs.buffer(INFORMATION_LEVEL,
-                           "Performance schema disabled (reason: start parameters).");
     }
   }
 #else
@@ -4817,7 +4815,14 @@ int mysqld_main(int argc, char **argv)
 
 #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
   initialize_performance_schema_acl(opt_bootstrap);
-  check_performance_schema();
+  /*
+    Do not check the structure of the performance schema tables
+    during bootstrap:
+    - the tables are not supposed to exist yet, bootstrap will create them
+    - a check would print spurious error messages
+  */
+  if (! opt_bootstrap)
+    check_performance_schema();
 #endif
 
   initialize_information_schema_acl();


--===============0814656783819907307==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   54467/
# testament_sha1: 67381b318fa034865a40349fa4a0ad6b0375b62c
# timestamp: 2010-06-16 06:36:44 -0600
# base_revision_id: alik@stripped
# 
# Begin bundle
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


--===============0814656783819907307==--