diff options
| author | lars@mysql.com <> | 2005-08-24 11:14:41 +0200 |
|---|---|---|
| committer | lars@mysql.com <> | 2005-08-24 11:14:41 +0200 |
| commit | f34398ba65d41528b1f4b0c94187f968d1131926 (patch) | |
| tree | 4b394e4bf245e53cf5bc662f0d95819aee4e3d38 /sql/log_event.cc | |
| parent | 5d736f106339224dfa87e9bd31c558d800206f0c (diff) | |
| download | mariadb-git-f34398ba65d41528b1f4b0c94187f968d1131926.tar.gz | |
BUG#12532: Fix for the case when my_malloc is macro
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 9e8c0695b90..c0a06bf5dab 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1328,14 +1328,19 @@ Query_log_event::Query_log_event(const char* buf, uint event_len, } } +#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE) if (!(start= data_buf = (char*) my_malloc(catalog_len + 1 + time_zone_len + 1 + - data_len + 1 -#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE) - + QUERY_CACHE_FLAGS_SIZE + - db_len + 1 + data_len + 1 + + QUERY_CACHE_FLAGS_SIZE + + db_len + 1, + MYF(MY_WME)))) +#else + if (!(start= data_buf = (char*) my_malloc(catalog_len + 1 + + time_zone_len + 1 + + data_len + 1, + MYF(MY_WME)))) #endif - , MYF(MY_WME)))) DBUG_VOID_RETURN; if (catalog_len) // If catalog is given { |