Commit cfe679b3 authored by unknown's avatar unknown
Browse files

Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 

into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50_1


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
parents 739a7613 d149fc30

sql/log_event.cc

+1 −0
Original line number Diff line number Diff line
@@ -1398,6 +1398,7 @@ bool Query_log_event::write(IO_CACHE* file) 
  

  /* Store length of status variables */

  status_vars_len= (uint) (start-start_of_status);

  DBUG_ASSERT(status_vars_len <= MAX_SIZE_LOG_EVENT_STATUS);

  int2store(buf + Q_STATUS_VARS_LEN_OFFSET, status_vars_len);



  /*

sql/log_event.h

+14 −4
Original line number Diff line number Diff line
@@ -202,10 +202,20 @@ struct sql_ex_info 


/* 

  Max number of possible extra bytes in a replication event compared to a

  packet (i.e. a query) sent from client to master.

  packet (i.e. a query) sent from client to master;

  First, an auxiliary log_event status vars estimation:

*/

#define MAX_LOG_EVENT_HEADER   (LOG_EVENT_HEADER_LEN + /* write_header */ \

#define MAX_SIZE_LOG_EVENT_STATUS (4 /* flags2 */   + \

                                   8 /* sql mode */ + \

                                   1 + 1 + 255 /* catalog */ + \

                                   4 /* autoinc */ + \

                                   6 /* charset */ + \

                                   MAX_TIME_ZONE_NAME_LENGTH)

#define MAX_LOG_EVENT_HEADER   ( /* in order of Query_log_event::write */ \

  LOG_EVENT_HEADER_LEN + /* write_header */ \

  QUERY_HEADER_LEN     + /* write_data */   \

  EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN + /*write_post_header_for_derived */ \

  MAX_SIZE_LOG_EVENT_STATUS + /* status */ \

  NAME_LEN + 1)



/*