bk commit into 5.0 tree (lars:1.1914) BUG#12532

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1914 05/08/24 01:45:15 lars@stripped +2 -0
  BUG#12532: Fixes after review

  sql/sql_parse.cc
    1.473 05/08/24 01:43:16 lars@stripped +2 -1
    Review fixes

  sql/log_event.cc
    1.187 05/08/24 01:42:55 lars@stripped +6 -7
    Review fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/ltx/dev/mysql-5.0-bug12532

--- 1.186/sql/log_event.cc	2005-08-24 00:16:47 +02:00
+++ 1.187/sql/log_event.cc	2005-08-24 01:42:55 +02:00
@@ -1330,14 +1330,13 @@
   
   if (!(start= data_buf = (char*) my_malloc(catalog_len + 1 +
                                             time_zone_len + 1 +
-                                            data_len + 1 +
-#ifndef MYSQL_CLIENT
-#ifdef HAVE_QUERY_CACHE
-					    QUERY_CACHE_FLAGS_SIZE +
+                                            data_len + 1
+#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE)
+					    + QUERY_CACHE_FLAGS_SIZE +
+					    db_len + 1
 #endif
-#endif
-					    db_len + 1, MYF(MY_WME))))
-    DBUG_VOID_RETURN;
+					    , MYF(MY_WME))))
+      DBUG_VOID_RETURN;
   if (catalog_len)                                  // If catalog is given
   {
     if (likely(catalog_nz)) // true except if event comes from 5.0.0|1|2|3.

--- 1.472/sql/sql_parse.cc	2005-08-22 00:13:18 +02:00
+++ 1.473/sql/sql_parse.cc	2005-08-24 01:43:16 +02:00
@@ -1218,7 +1218,8 @@
       length--;
     buff[length]=0;
     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';
     /*
       We don't need to obtain LOCK_thread_count here because in bootstrap