diff options
author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
commit | 9016688fca04deb8f838f83269fd9b99c88aa5ac (patch) | |
tree | 0bab5217d4ea83929d314c2ce29f962a949c95c8 /mysql-test/t/archive.test | |
parent | a4d61391c61bf770e37b2f26c0304d334e0b1eb7 (diff) | |
parent | f411e63c98f4340aafa5677ef1650cb945f1387a (diff) | |
download | mariadb-git-9016688fca04deb8f838f83269fd9b99c88aa5ac.tar.gz |
Manual merge of WL#4738 from mysql-next-mr:
- backported code that handles %f/%g arguments in
my_vsnprintf.c from 6.0
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c
from 6.0
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt()
- removed unnecessary "--replace-result"s for Windows in
mysql-test/suite/sys_vars/t/long_query_time_basic.test
- some test results adjustments
Diffstat (limited to 'mysql-test/t/archive.test')
-rw-r--r-- | mysql-test/t/archive.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test index bd5f8c96518..a4a4bafcc5a 100644 --- a/mysql-test/t/archive.test +++ b/mysql-test/t/archive.test @@ -1615,7 +1615,7 @@ DROP TABLE t1; # BUG#46961 - archive engine loses rows during self joining select! # SET @save_join_buffer_size= @@join_buffer_size; -SET @@join_buffer_size= 8228; +SET @@join_buffer_size= 8192; CREATE TABLE t1(a CHAR(255)) ENGINE=archive; INSERT INTO t1 VALUES('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'), ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'), |