database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge damien-katzs-computer.local:/Users/dkatz/50b

Browse Source 
into  damien-katzs-computer.local:/Users/dkatz/51merge
This commit is contained in:
dkatz@damien-katzs-computer.local
2007-04-16 14:08:03 -04:00
parent 43d1912e7b 138f003738
commit 227115fa2b
3 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/r/variables-big.result Normal file
View File

@ -0,0 +1,20 @@
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

20
mysql-test/t/variables-big.test Normal file
View File

@ -0,0 +1,20 @@
#
# 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;

4
mysys/my_alloc.c
View File

@ -133,6 +133,10 @@ void reset_root_defaults(MEM_ROOT *mem_root, uint block_size,
mem->next= *prev; mem->next= *prev;
*prev= mem_root->pre_alloc= mem; *prev= mem_root->pre_alloc= mem;
} }
else
{
mem_root->pre_alloc= 0;
}
} }
} }
else else