bzr push into mysql-trunk branch (alfranio.correia:3332 to 3333) Bug#12324076

[Alfranio Correia]

 3333 Alfranio Correia	2011-04-06
      BUG#12324076 - RQG_RPL_SEMISYNC TEST FAILURE, SLAVE CRASHES WITH SEGMENTATION FAULT
      
      The patch for BUG#11765887 BUG#58897 verifies if the configuration is not
      crash-safe and prints out a warning message to alert users on that.
      
      The routine that keeps track of warnings and errors on the slave was modified
      in BUG#11748510 - BUG#36524 and after that report_function may be null if
      global_system_variables.log_warnings is not set. However, report_function is
      used without checking its value thus causing a crash.
      
      Fixed the problem, by checking if report_function is null before using it.

    modified:
      sql/rpl_reporting.cc
 3332 Georgi Kodinov	2011-04-05
      Bug #11922942 : MAIN.VARIABLES-BIG FAILS DUE TO CHANGE IN SHOW PROCESS 
      OUTPUT 
      
      Fixed a test case to show correct status updated by P_S schema changes.

    modified:
      mysql-test/r/variables-big.result
=== modified file 'sql/rpl_reporting.cc'
--- a/sql/rpl_reporting.cc	2011-03-28 13:19:08 +0000
+++ b/sql/rpl_reporting.cc	2011-04-06 13:33:37 +0000
@@ -149,10 +149,11 @@ Slave_reporting_capability::report(logle
   va_end(args);
 
   /* If the msg string ends with '.', do not add a ',' it would be ugly */
-  report_function("Slave %s: %s%s Error_code: %d",
-                  m_thread_name, pbuff,
-                  (pbuff[0] && *(strend(pbuff)-1) == '.') ? "" : ",",
-                  err_code);
+  if (report_function)
+    report_function("Slave %s: %s%s Error_code: %d",
+                    m_thread_name, pbuff,
+                    (pbuff[0] && *(strend(pbuff)-1) == '.') ? "" : ",",
+                    err_code);
 #endif  
 }
 

No bundle (reason: useless for push emails).