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

BUG#12532: Fixes after review

Browse Source 
sql/log_event.cc:
  Review fixes
sql/sql_parse.cc:
  Review fixes
This commit is contained in:
unknown
2005-08-24 01:45:15 +02:00
parent 7271ea2508
commit 15f626c293
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/log_event.cc
View File

@@ -1330,14 +1330,13 @@ Query_log_event::Query_log_event(const char* buf, uint event_len,
if (!(start= data_buf = (char*) my_malloc(catalog_len + 1 + if (!(start= data_buf = (char*) my_malloc(catalog_len + 1 +
time_zone_len + 1 + time_zone_len + 1 +
data_len + 1 + data_len + 1
#ifndef MYSQL_CLIENT #if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE)
#ifdef HAVE_QUERY_CACHE + QUERY_CACHE_FLAGS_SIZE +
QUERY_CACHE_FLAGS_SIZE + db_len + 1
#endif #endif
#endif , MYF(MY_WME))))
db_len + 1, MYF(MY_WME)))) DBUG_VOID_RETURN;
DBUG_VOID_RETURN;
if (catalog_len) // If catalog is given if (catalog_len) // If catalog is given
{ {
if (likely(catalog_nz)) // true except if event comes from 5.0.0|1|2|3. if (likely(catalog_nz)) // true except if event comes from 5.0.0|1|2|3.

3
sql/sql_parse.cc
View File

@@ -1218,7 +1218,8 @@ extern "C" pthread_handler_decl(handle_bootstrap,arg)
length--; length--;
buff[length]=0; buff[length]=0;
thd->query_length=length; thd->query_length=length;
thd->query= thd->memdup_w_gap(buff, length+1, thd->db_length+1); thd->query= thd->memdup_w_gap(buff, length+1,
thd->db_length+1+QUERY_CACHE_FLAGS_SIZE);
thd->query[length] = '\0'; thd->query[length] = '\0';
/* /*
We don't need to obtain LOCK_thread_count here because in bootstrap We don't need to obtain LOCK_thread_count here because in bootstrap