diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-06-04 17:26:11 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-06-04 17:26:11 +0200 |
commit | 3e3606d21deec2a7508d47740ab7a7a7f5b9b698 (patch) | |
tree | 5e041eb2fc7ca4f15ff97bfc3dba62840ab802fc /sql/log_event.cc | |
parent | afedd72e225654225b20a91b072b012e4c57a9d4 (diff) | |
parent | 25ada13db06d06050f0361bc434fe2b58303b5f2 (diff) | |
download | mariadb-git-3e3606d21deec2a7508d47740ab7a7a7f5b9b698.tar.gz |
merge with 5.3.
Take only test cases from MDEV-136 Non-blocking "set read_only"
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r-- | sql/log_event.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 10d976e6b59..5dc46031980 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -3222,6 +3222,7 @@ Query_log_event::Query_log_event(const char* buf, uint event_len, if (!(start= data_buf = (Log_event::Byte*) my_malloc(catalog_len + 1 + time_zone_len + 1 + data_len + 1 + + QUERY_CACHE_DB_LENGTH_SIZE + QUERY_CACHE_FLAGS_SIZE + user.length + 1 + host.length + 1 + |