summaryrefslogtreecommitdiff
path: root/mysql-test/r/archive.result
diff options
context:
space:
mode:
authorunknown <Dao-Gang.Qu@sun.com>2010-01-12 20:07:09 +0800
committerunknown <Dao-Gang.Qu@sun.com>2010-01-12 20:07:09 +0800
commit16e15e69523c5aebd6642a47b216f736cfd456a2 (patch)
tree81fd0ce6bdc321649671cd1240deb0d5b1248e49 /mysql-test/r/archive.result
parent4b67a11d2bf201e273be79054b26e90ada15be38 (diff)
parent3701208a2e890d42aabc678a2a5d4ea539941b36 (diff)
downloadmariadb-git-16e15e69523c5aebd6642a47b216f736cfd456a2.tar.gz
Manual merge from next-mr.
Diffstat (limited to 'mysql-test/r/archive.result')
-rw-r--r--mysql-test/r/archive.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result
index 9d050d84235..aaab9d27edb 100644
--- a/mysql-test/r/archive.result
+++ b/mysql-test/r/archive.result
@@ -12708,7 +12708,7 @@ DATA_LENGTH AVG_ROW_LENGTH
8700 4350
DROP TABLE t1;
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'),