|
|
|
@ -2133,8 +2133,8 @@ void Query_log_event::pack_info(Protocol *protocol) |
|
|
|
/**
|
|
|
|
Utility function for the next method (Query_log_event::write()) . |
|
|
|
*/ |
|
|
|
static void write_str_with_code_and_len(char **dst, const char *src, |
|
|
|
int len, uint code) |
|
|
|
static void write_str_with_code_and_len(uchar **dst, const char *src, |
|
|
|
uint len, uint code) |
|
|
|
{ |
|
|
|
/*
|
|
|
|
only 1 byte to store the length of catalog, so it should not |
|
|
|
@ -2229,7 +2229,7 @@ bool Query_log_event::write(IO_CACHE* file) |
|
|
|
} |
|
|
|
if (catalog_len) // i.e. this var is inited (false for 4.0 events)
|
|
|
|
{ |
|
|
|
write_str_with_code_and_len((char **)(&start), |
|
|
|
write_str_with_code_and_len(&start, |
|
|
|
catalog, catalog_len, Q_CATALOG_NZ_CODE); |
|
|
|
/*
|
|
|
|
In 5.0.x where x<4 masters we used to store the end zero here. This was |
|
|
|
@ -2267,7 +2267,7 @@ bool Query_log_event::write(IO_CACHE* file) |
|
|
|
{ |
|
|
|
/* In the TZ sys table, column Name is of length 64 so this should be ok */ |
|
|
|
DBUG_ASSERT(time_zone_len <= MAX_TIME_ZONE_NAME_LENGTH); |
|
|
|
write_str_with_code_and_len((char **)(&start), |
|
|
|
write_str_with_code_and_len(&start, |
|
|
|
time_zone_str, time_zone_len, Q_TIME_ZONE_CODE); |
|
|
|
} |
|
|
|
if (lc_time_names_number) |
|
|
|
|