bzr push into mysql-trunk branch (frazer.clement:3716 to 3717) WL#5917

[Frazer Clement]

 3717 Frazer Clement	2012-03-13
      WL#5917 : Fix missing description event initialisation

    modified:
      sql/log_event.cc
      sql/log_event.h
 3716 Frazer Clement	2012-03-12
      WL#5917 
      
      Reserving Binlog log event numbers for future push

    modified:
      sql/log_event.h
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2012-02-28 10:57:17 +0000
+++ b/sql/log_event.cc	2012-03-13 10:40:23 +0000
@@ -5041,6 +5041,9 @@ Format_description_log_event(uint8 binlo
       post_header_len[HEARTBEAT_LOG_EVENT-1]= 0;
       post_header_len[IGNORABLE_LOG_EVENT-1]= IGNORABLE_HEADER_LEN;
       post_header_len[ROWS_QUERY_LOG_EVENT-1]= IGNORABLE_HEADER_LEN;
+      post_header_len[RESERVED_EVENT_NUM_1-1]= RESERVED_HEADER_LEN;
+      post_header_len[RESERVED_EVENT_NUM_2-1]= RESERVED_HEADER_LEN;
+      post_header_len[RESERVED_EVENT_NUM_3-1]= RESERVED_HEADER_LEN;
       post_header_len[GTID_LOG_EVENT-1]=
         post_header_len[ANONYMOUS_GTID_LOG_EVENT-1]=
         Gtid_log_event::POST_HEADER_LENGTH;

=== modified file 'sql/log_event.h'
--- a/sql/log_event.h	2012-03-12 17:43:28 +0000
+++ b/sql/log_event.h	2012-03-13 10:40:23 +0000
@@ -269,6 +269,7 @@ struct sql_ex_info
 #define INCIDENT_HEADER_LEN    2
 #define HEARTBEAT_HEADER_LEN   0
 #define IGNORABLE_HEADER_LEN   0
+#define RESERVED_HEADER_LEN    0
 
 /*
    The maximum number of updated databases that a status of

No bundle (reason: useless for push emails).