From: Date: April 11 2007 9:32am
Subject: bk commit into 5.0 tree (dkatz:1.2437) BUG#27322
List-Archive: http://lists.mysql.com/commits/24255
X-Bug: 27322
Message-Id: <20070411073254.1AB7628BBDF@damien-katzs-computer.local>

Below is the list of changes that have just been committed into a local
5.0 repository of dkatz. When dkatz 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@stripped, 2007-04-11 03:32:49-04:00, dkatz@stripped +1 -0
  Bug #27322  	failure to allocate transaction_prealloc_size causes crash
  
  Fix for when memory pre-allocation fails.

  mysys/my_alloc.c@stripped, 2007-04-11 03:32:45-04:00, dkatz@stripped +4 -0
    Added code to null-out the pre-alloc pointer if allocation fails. This is necessary for the next time this procedure is called.

# 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:	dkatz
# Host:	damien-katzs-computer.local
# Root:	/Users/dkatz/50b

--- 1.34/mysys/my_alloc.c	2006-12-23 14:04:07 -05:00
+++ 1.35/mysys/my_alloc.c	2007-04-11 03:32:45 -04:00
@@ -133,6 +133,10 @@
         mem->next= *prev;
         *prev= mem_root->pre_alloc= mem; 
       }
+      else
+      {
+        mem_root->pre_alloc= 0;
+      }
     }
   }
   else