diff options
| author | Rohit Kalhans <rohit.kalhans@oracle.com> | 2012-05-30 14:27:27 +0530 |
|---|---|---|
| committer | Rohit Kalhans <rohit.kalhans@oracle.com> | 2012-05-30 14:27:27 +0530 |
| commit | c7497eb045b9259693a4d8d03d5d897baad08a90 (patch) | |
| tree | afe771e273c2969bab7af8837b24e56e8cdd06e3 /sql | |
| parent | 5fbbd4311a34513ccceaa80250dba649a2f22462 (diff) | |
| parent | e93fc1fe29e198ec9ab291ef2433ba533c271e18 (diff) | |
| download | mariadb-git-c7497eb045b9259693a4d8d03d5d897baad08a90.tar.gz | |
upmerge from mysql-5.1 branch -> mysql-5.5 branch
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index fe0e8c19c35..47d1bef0eea 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2926,17 +2926,24 @@ Query_log_event::Query_log_event(const char* buf, uint event_len, sql_parse.cc */ +#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE) 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 -#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE) - + sizeof(size_t)//for db_len - + db_len + 1 - + QUERY_CACHE_FLAGS_SIZE + + sizeof(size_t)//for db_len + + db_len + 1 + + 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 - , MYF(MY_WME)))) DBUG_VOID_RETURN; if (catalog_len) // If catalog is given { |