1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automerge bzr bundle in bug report into local mysql-5.1-bugteam latest.

Browse Source
This commit is contained in:
Luis Soares 2009-12-07 00:28:14 +00:00
commit 3a733bb4d8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/log_event.cc
View File

@ -2138,8 +2138,8 @@ void Query_log_event::pack_info(Protocol *protocol)
/** /**
Utility function for the next method (Query_log_event::write()) . Utility function for the next method (Query_log_event::write()) .
*/ */
static void write_str_with_code_and_len(char **dst, const char *src, static void write_str_with_code_and_len(uchar **dst, const char *src,
int len, uint code) uint len, uint code)
{ {
/* /*
only 1 byte to store the length of catalog, so it should not only 1 byte to store the length of catalog, so it should not
@ -2234,7 +2234,7 @@ bool Query_log_event::write(IO_CACHE* file)
} }
if (catalog_len) // i.e. this var is inited (false for 4.0 events) 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); 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 In 5.0.x where x<4 masters we used to store the end zero here. This was
@ -2272,7 +2272,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 */ /* 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); 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); time_zone_str, time_zone_len, Q_TIME_ZONE_CODE);
} }
if (lc_time_names_number) if (lc_time_names_number)