bzr push into mysql-trunk branch (frazer.clement:3714 to 3715)

[Frazer Clement]

 3715 Frazer Clement	2012-03-12
      Test reserving log event numbers

    modified:
      sql/log_event.h
 3714 Alfranio Correia	2012-03-12
      BUG#13820370 - RPL_GTID_MODE FAILS IN PB
        
      The test case rpl_gtid_mode.test is doing the following steps to
      check whether the server fails while starting up as supposed to be
      or not:
        
        . starting slave with gtid-mode=ON; 
        . issuing "CHANGE MASTER TO AUTO_POSITION=1"; 
        . shutting down slave; 
        . trying to restart slave with gtid-mode=OFF. 
        
      However, when the slave fails in the startup routine, it tries to
      print out an error message with ER(X) which uses "current_thread". 
      This variable is not defined though as there is no thread causing
      a segmentation fault.
        
      To fix the problem, we replace ER(X) by my_error().

    modified:
      mysql-test/include/assert_command_output.inc
      sql/mysqld.cc
      sql/rpl_mi.cc
=== modified file 'sql/log_event.h'
--- a/sql/log_event.h	2012-02-28 10:57:17 +0000
+++ b/sql/log_event.h	2012-03-12 16:39:22 +0000
@@ -691,10 +691,15 @@ enum Log_event_type
   IGNORABLE_LOG_EVENT= 28,
   ROWS_QUERY_LOG_EVENT= 29,
 
-  GTID_LOG_EVENT= 30,
-  ANONYMOUS_GTID_LOG_EVENT= 31,
+  /* Following event numbers reserved for WL#5917 */
+  RESERVED_EVENT_NUM_1 = 30,
+  RESERVED_EVENT_NUM_2 = 31,
+  RESERVED_EVENT_NUM_3 = 32,
 
-  PREVIOUS_GTIDS_LOG_EVENT= 32,
+  GTID_LOG_EVENT= 33,
+  ANONYMOUS_GTID_LOG_EVENT= 34,
+
+  PREVIOUS_GTIDS_LOG_EVENT= 35,
   /*
     Add new events here - right above this comment!
     Existing events (except ENUM_END_EVENT) should never change their numbers

No bundle (reason: useless for push emails).