diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-06-11 14:53:26 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-06-11 14:53:26 +0200 |
| commit | 93bcda598bd6c58a7f5ad3d2e860b194325eed9f (patch) | |
| tree | 014bccd2ba79d230f4f3cb4ff03f89640b99e1e4 /mysql-test/r/variables-big.result | |
| parent | d2d7b5bbb6796ee171ef605f5ea61cb782918b72 (diff) | |
| parent | 121461f6f3987c4b058d64775f1380016b68896c (diff) | |
| download | mariadb-git-93bcda598bd6c58a7f5ad3d2e860b194325eed9f.tar.gz | |
Merge latest XtraDB from lp:percona-xtradb into MariaDB.
include/my_sys.h:
Move generic file parsing functions out to shared code, as they are used in several places.
mysys/mf_iocache2.c:
Move generic file parsing functions out to shared code, as they are used in several places.
sql/log_event.cc:
Fix XtraDB build with embedded server.
XtraDB needs access to replication stuff, which is missing in embedded server.
Solved by defining wrapper function for this which is compiled differently for normal and
embedded case.
sql/log_event.h:
Fix XtraDB build with embedded server.
XtraDB needs access to replication stuff, which is missing in embedded server.
Solved by defining wrapper function for this which is compiled differently for normal and
embedded case.
sql/slave.cc:
Move generic file parsing functions out to shared code, as they are used in several places.
Diffstat (limited to 'mysql-test/r/variables-big.result')
| -rw-r--r-- | mysql-test/r/variables-big.result | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/mysql-test/r/variables-big.result b/mysql-test/r/variables-big.result index 35882c7e284..2c178999a2c 100644 --- a/mysql-test/r/variables-big.result +++ b/mysql-test/r/variables-big.result @@ -1,20 +1,20 @@ set session transaction_prealloc_size=1024*1024*1024*1; -show processlist; -Id User Host db Command Time State Info -# root localhost test Query 0 NULL show processlist +select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; +TRUE +1 set session transaction_prealloc_size=1024*1024*1024*2; -show processlist; -Id User Host db Command Time State Info -# root localhost test Query 0 NULL show processlist +select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; +TRUE +1 set session transaction_prealloc_size=1024*1024*1024*3; -show processlist; -Id User Host db Command Time State Info -# root localhost test Query 0 NULL show processlist +select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; +TRUE +1 set session transaction_prealloc_size=1024*1024*1024*4; -show processlist; -Id User Host db Command Time State Info -# root localhost test Query 0 NULL show processlist +select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; +TRUE +1 set session transaction_prealloc_size=1024*1024*1024*5; -show processlist; -Id User Host db Command Time State Info -# root localhost test Query 0 NULL show processlist +select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; +TRUE +1 |