diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/r/variables-big.result | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/r/variables-big.result')
| -rw-r--r-- | mysql-test/r/variables-big.result | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/mysql-test/r/variables-big.result b/mysql-test/r/variables-big.result index 02908502c8b..e845400b397 100644 --- a/mysql-test/r/variables-big.result +++ b/mysql-test/r/variables-big.result @@ -1,22 +1,21 @@ 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 -<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST +Id User Host db Command Time State Info Progress +<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST 0.000 SET SESSION transaction_prealloc_size=1024*1024*1024*2; SHOW PROCESSLIST; -Id User Host db Command Time State Info -<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST +Id User Host db Command Time State Info Progress +<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST 0.000 SET SESSION transaction_prealloc_size=1024*1024*1024*3; SHOW PROCESSLIST; -Id User Host db Command Time State Info -<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST +Id User Host db Command Time State Info Progress +<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST 0.000 SET SESSION transaction_prealloc_size=1024*1024*1024*4; SHOW PROCESSLIST; -Id User Host db Command Time State Info -<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST +Id User Host db Command Time State Info Progress +<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST 0.000 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; +Id User Host db Command Time State Info Progress +<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST 0.000 |