diff options
| author | Horst.Hunger <horst.hunger@sun.com> | 2011-05-24 11:16:34 +0200 |
|---|---|---|
| committer | Horst.Hunger <horst.hunger@sun.com> | 2011-05-24 11:16:34 +0200 |
| commit | 41c13fb5c759677e698533e8be21056cf4f5379b (patch) | |
| tree | 83b2a4012789b1a2cfd13adddd5d1d8ea09bb079 | |
| parent | 34e5d4740e9eddb13ea735c294152dffe34e9e06 (diff) | |
| download | mariadb-git-41c13fb5c759677e698533e8be21056cf4f5379b.tar.gz | |
Merge of this test from trunk to 5.5 to have a successful weekly test on Windows.
| -rw-r--r-- | mysql-test/r/variables-big.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/variables-big.test | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/variables-big.result b/mysql-test/r/variables-big.result index 71b32393d82..02908502c8b 100644 --- a/mysql-test/r/variables-big.result +++ b/mysql-test/r/variables-big.result @@ -1,3 +1,4 @@ +SET @def_var= @@session.transaction_prealloc_size; SET SESSION transaction_prealloc_size=1024*1024*1024*1; SHOW PROCESSLIST; Id User Host db Command Time State Info @@ -18,3 +19,4 @@ SET SESSION transaction_prealloc_size=1024*1024*1024*5; SHOW PROCESSLIST; Id User Host db Command Time State Info <Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST +SET @@session.transaction_prealloc_size= @def_var; diff --git a/mysql-test/t/variables-big.test b/mysql-test/t/variables-big.test index 6c357bb6e54..53f426757b6 100644 --- a/mysql-test/t/variables-big.test +++ b/mysql-test/t/variables-big.test @@ -34,6 +34,7 @@ # There is a significant probablitity that this tests fails with testcase # timeout if the testing box is not powerful enough. # +SET @def_var= @@session.transaction_prealloc_size; --disable_warnings SET SESSION transaction_prealloc_size=1024*1024*1024*1; @@ -53,3 +54,5 @@ SET SESSION transaction_prealloc_size=1024*1024*1024*5; SHOW PROCESSLIST; --enable_warnings +SET @@session.transaction_prealloc_size= @def_var; + |