diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-12-07 00:28:14 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-12-07 00:28:14 +0000 |
| commit | 3a733bb4d8c6e1fc9bf9f07aff484d7fb62724a7 (patch) | |
| tree | e4ba156907b91b9224c72a9a6febdac7161ce623 | |
| parent | 7948403b051c1c33ea3341ee799a3f48ac3accb5 (diff) | |
| parent | 46ca22b093406d566d8f108f55111fc70b49af80 (diff) | |
| download | mariadb-git-3a733bb4d8c6e1fc9bf9f07aff484d7fb62724a7.tar.gz | |
Automerge bzr bundle in bug report into local mysql-5.1-bugteam latest.
| -rw-r--r-- | sql/log_event.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 150657eabc0..6686a4634f7 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2138,8 +2138,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 @@ -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) { - 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 @@ -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 */ 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) |