From 53f73da2861830769d4f0bb58b1ac1a057cf3cef Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Apr 2007 18:03:26 -0400 Subject: Bug #27322 failure to allocate transaction_prealloc_size causes crash Fix for when memory pre-allocation fails. mysys/my_alloc.c: Added code to null-out the pre-alloc pointer if allocation fails. This is necessary for the next time this procedure is called. mysql-test/r/variables-big.result: Added "big" test for bug fix Bug #27322. mysql-test/t/variables-big.test: Added "big" test for bug fix Bug #27322. --- mysys/my_alloc.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mysys/my_alloc.c') diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index cfa2dd6216d..5983a29a3e1 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -133,6 +133,10 @@ void reset_root_defaults(MEM_ROOT *mem_root, uint block_size, mem->next= *prev; *prev= mem_root->pre_alloc= mem; } + else + { + mem_root->pre_alloc= 0; + } } } else -- cgit v1.2.1