MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:Lars Thalmann Date:August 24 2005 9:14am
Subject:bk commit into 5.0 tree (lars:1.1917) BUG#12532
View as plain text  
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.1917 05/08/24 11:14:41 lars@stripped +1 -0
  BUG#12532: Fix for the case when my_malloc is macro

  sql/log_event.cc
    1.188 05/08/24 11:12:11 lthalmann@stripped +10 -5
    my_malloc can be a macro

# 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.187/sql/log_event.cc	2005-08-24 01:42:55 +02:00
+++ 1.188/sql/log_event.cc	2005-08-24 11:12:11 +02:00
@@ -1328,14 +1328,19 @@
     }
   }
   
+#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE)
   if (!(start= data_buf = (char*) my_malloc(catalog_len + 1 +
                                             time_zone_len + 1 +
-                                            data_len + 1
-#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE)
-					    + QUERY_CACHE_FLAGS_SIZE +
-					    db_len + 1
+                                            data_len + 1 +
+					    QUERY_CACHE_FLAGS_SIZE +
+					    db_len + 1,
+					    MYF(MY_WME))))
+#else
+  if (!(start= data_buf = (char*) my_malloc(catalog_len + 1 +
+                                            time_zone_len + 1 +
+                                            data_len + 1,
+					    MYF(MY_WME))))
 #endif
-					    , MYF(MY_WME))))
       DBUG_VOID_RETURN;
   if (catalog_len)                                  // If catalog is given
   {
Thread
bk commit into 5.0 tree (lars:1.1917) BUG#12532Lars Thalmann24 Aug