From: Date: April 13 2007 12:03am
Subject: bk commit into 5.0 tree (dkatz:1.2437) BUG#27322
List-Archive: http://lists.mysql.com/commits/24436
X-Bug: 27322
Message-Id: <20070412220332.60C262915DF@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-12 18:03:26-04:00, dkatz@stripped +3 -0
  Bug #27322  	failure to allocate transaction_prealloc_size causes crash
  
  Fix for when memory pre-allocation fails.

  mysql-test/r/variables-big.result@stripped, 2007-04-12 18:03:24-04:00, dkatz@stripped +20 -0
    Added "big" test for bug fix Bug #27322.

  mysql-test/r/variables-big.result@stripped, 2007-04-12 18:03:24-04:00, dkatz@stripped +0 -0

  mysql-test/t/variables-big.test@stripped, 2007-04-12 18:03:24-04:00, dkatz@stripped +20 -0
    Added "big" test for bug fix Bug #27322.

  mysql-test/t/variables-big.test@stripped, 2007-04-12 18:03:24-04:00, dkatz@stripped +0 -0

  mysys/my_alloc.c@stripped, 2007-04-12 18:03:24-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-12 18:03:24 -04:00
@@ -133,6 +133,10 @@ void reset_root_defaults(MEM_ROOT *mem_r
         mem->next= *prev;
         *prev= mem_root->pre_alloc= mem; 
       }
+      else
+      {
+        mem_root->pre_alloc= 0;
+      }
     }
   }
   else
--- New file ---
+++ mysql-test/r/variables-big.result	07/04/12 18:03:24
set session transaction_prealloc_size=1024*1024*1024*1;
show processlist;
Id	User	Host	db	Command	Time	State	Info
1	root	localhost	test	Query	0	NULL	show processlist
set session transaction_prealloc_size=1024*1024*1024*2;
show processlist;
Id	User	Host	db	Command	Time	State	Info
1	root	localhost	test	Query	2	NULL	show processlist
set session transaction_prealloc_size=1024*1024*1024*3;
show processlist;
Id	User	Host	db	Command	Time	State	Info
1	root	localhost	test	Query	0	NULL	show processlist
set session transaction_prealloc_size=1024*1024*1024*4;
show processlist;
Id	User	Host	db	Command	Time	State	Info
1	root	localhost	test	Query	0	NULL	show processlist
set session transaction_prealloc_size=1024*1024*1024*5;
show processlist;
Id	User	Host	db	Command	Time	State	Info
1	root	localhost	test	Query	0	NULL	show processlist

--- New file ---
+++ mysql-test/t/variables-big.test	07/04/12 18:03:24
#
# test variables big
#

--source include/big_test.inc

#
# Bug #27322  	failure to allocate transaction_prealloc_size causes crash
#

set session transaction_prealloc_size=1024*1024*1024*1;
show processlist;
set session transaction_prealloc_size=1024*1024*1024*2;
show processlist;
set session transaction_prealloc_size=1024*1024*1024*3;
show processlist;
set session transaction_prealloc_size=1024*1024*1024*4;
show processlist;
set session transaction_prealloc_size=1024*1024*1024*5;
show processlist;