Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-25507

into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-25507


mysql-test/r/rpl_insert_id.result:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  will merge by hand
sql/sql_insert.cc:
  will fix by hand

1 files changed, 2 insertions, 0 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index 5994beb0df3..c888275151c 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -1153,6 +1153,7 @@ public:
   uint8 number_of_event_types;
   /* The list of post-headers' lengthes */
   uint8 *post_header_len;
+  uchar server_version_split[3];
 
   Format_description_log_event(uint8 binlog_ver, const char* server_ver=0);
 
@@ -1184,6 +1185,7 @@ public:
     */
     return FORMAT_DESCRIPTION_HEADER_LEN;
   }
+  void calc_server_version_split();
 };