bk commit into 5.0 tree (lars:1.1996) 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.1996 05/08/19 16:25:55 lars@stripped +2 -0
  BUG#12532: Added more memory in malloc for slave query cache

  sql/sql_cache.cc
    1.83 05/08/19 16:17:42 lthalmann@stripped +4 -0
    Added comment

  sql/log_event.cc
    1.185 05/08/19 16:17:18 lthalmann@stripped +7 -1
    Added memory to malloc

# 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.184/sql/log_event.cc	2005-07-19 20:05:45 +02:00
+++ 1.185/sql/log_event.cc	2005-08-19 16:17:18 +02:00
@@ -1330,7 +1330,13 @@
   
   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
   {

--- 1.82/sql/sql_cache.cc	2005-08-11 13:02:44 +02:00
+++ 1.83/sql/sql_cache.cc	2005-08-19 16:17:42 +02:00
@@ -923,6 +923,10 @@
 	0	The query was cached and user was sent the result.
 	-1	The query was cached but we didn't have rights to use it.
 		No error is sent to the client yet.
+
+  NOTE
+  This method requires that sql points to allocated memory of size:
+  tot_length= query_length + thd->db_length + 1 + QUERY_CACHE_FLAGS_SIZE;
 */
 
 int