database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Fixing the build failure on Windows debug build.

Browse Source
This commit is contained in:
Rohit Kalhans
2012-05-30 13:54:15 +05:30
parent d8b2d4a069
commit 96eb519eb7
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/log_event.cc
View File

@@ -2852,17 +2852,24 @@ Query_log_event::Query_log_event(const char* buf, uint event_len,
sql_parse.cc sql_parse.cc
*/ */
#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE)
if (!(start= data_buf = (Log_event::Byte*) my_malloc(catalog_len + 1 if (!(start= data_buf = (Log_event::Byte*) my_malloc(catalog_len + 1
+ time_zone_len + 1 + time_zone_len + 1
+ user.length + 1 + user.length + 1
+ host.length + 1 + host.length + 1
+ data_len + 1 + data_len + 1
#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE) + sizeof(size_t)//for db_len
+ sizeof(size_t)//for db_len + db_len + 1
+ db_len + 1 + QUERY_CACHE_FLAGS_SIZE,
+ QUERY_CACHE_FLAGS_SIZE MYF(MY_WME))))
#else
if (!(start= data_buf = (Log_event::Byte*) my_malloc(catalog_len + 1
+ time_zone_len + 1
+ user.length + 1
+ host.length + 1
+ data_len + 1,
MYF(MY_WME))))
#endif #endif
, MYF(MY_WME))))
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
if (catalog_len) // If catalog is given if (catalog_len) // If catalog is given
{ {