diff options
| author | unknown <lars@mysql.com> | 2005-08-24 00:16:58 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-08-24 00:16:58 +0200 |
| commit | 7271ea2508567a5e91552f8a08460b6ce23f07ce (patch) | |
| tree | ed6cb60b74b3b969ea18035752b761500f3ad31c /sql/log_event.cc | |
| parent | 96f884c03a1d85ec550d15157f99ab70dd7cf19f (diff) | |
| parent | 3e946906272009aac5145f85421992f78ba4eff0 (diff) | |
| download | mariadb-git-7271ea2508567a5e91552f8a08460b6ce23f07ce.tar.gz | |
Merge mysql.com:/users/lthalmann/ltx/root/mysql-5.0
into mysql.com:/users/lthalmann/ltx/dev/mysql-5.0-bug12532
sql/log_event.cc:
Auto merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 23a301873cd..a07efc21915 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1330,7 +1330,13 @@ Query_log_event::Query_log_event(const char* buf, uint event_len, if (!(start= data_buf = (char*) my_malloc(catalog_len + 1 + time_zone_len + 1 + - data_len + 1, MYF(MY_WME)))) + data_len + 1 + +#ifndef MYSQL_CLIENT +#ifdef HAVE_QUERY_CACHE + QUERY_CACHE_FLAGS_SIZE + +#endif +#endif + db_len + 1, MYF(MY_WME)))) DBUG_VOID_RETURN; if (catalog_len) // If catalog is given { |