summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorSerge Kozlov <Serge.Kozlov@oracle.com>2011-04-19 00:08:25 +0400
committerSerge Kozlov <Serge.Kozlov@oracle.com>2011-04-19 00:08:25 +0400
commit4f8f6401c93cfee0350bf47e656a1e2348cf2c2b (patch)
tree1153b28ad96da4fe69554e12f0e38d6dd3664336 /mysql-test/suite
parent941c8e5a272d662c8052c25fc92207241023ae9b (diff)
parentdba184237a2504c880ed08e34e91e40a76f738e7 (diff)
downloadmariadb-git-4f8f6401c93cfee0350bf47e656a1e2348cf2c2b.tar.gz
autocommit 5.1 -> 5.5
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/binlog/r/binlog_bug23533.result3
-rw-r--r--mysql-test/suite/binlog/t/binlog_bug23533.test5
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_bug23533.result b/mysql-test/suite/binlog/r/binlog_bug23533.result
index 07b124793d1..02605839ab0 100644
--- a/mysql-test/suite/binlog/r/binlog_bug23533.result
+++ b/mysql-test/suite/binlog/r/binlog_bug23533.result
@@ -3,7 +3,9 @@ CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b TEXT, PRIMARY KEY(a)) ENGINE=I
SELECT COUNT(*) FROM t1;
COUNT(*)
1000
+SET @saved_binlog_cache_size=@@binlog_cache_size;
SET @saved_max_binlog_cache_size=@@max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=4096;
SET GLOBAL max_binlog_cache_size=4096;
START TRANSACTION;
CREATE TABLE t2 SELECT * FROM t1;
@@ -13,4 +15,5 @@ SHOW TABLES LIKE 't%';
Tables_in_test (t%)
t1
SET GLOBAL max_binlog_cache_size=@saved_max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=@saved_binlog_cache_size;
DROP TABLE t1;
diff --git a/mysql-test/suite/binlog/t/binlog_bug23533.test b/mysql-test/suite/binlog/t/binlog_bug23533.test
index fb2fc808b7b..05fe9fd9523 100644
--- a/mysql-test/suite/binlog/t/binlog_bug23533.test
+++ b/mysql-test/suite/binlog/t/binlog_bug23533.test
@@ -15,14 +15,18 @@ CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b TEXT, PRIMARY KEY(a)) ENGINE=I
let $i= 1000;
while ($i)
{
+ BEGIN;
eval INSERT INTO t1 VALUES($i, REPEAT('x', 4096));
+ COMMIT;
dec $i;
}
--enable_query_log
SELECT COUNT(*) FROM t1;
# Set small value for max_binlog_cache_size
+SET @saved_binlog_cache_size=@@binlog_cache_size;
SET @saved_max_binlog_cache_size=@@max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=4096;
SET GLOBAL max_binlog_cache_size=4096;
# Copied data from t1 into t2 large than max_binlog_cache_size
@@ -34,4 +38,5 @@ SHOW TABLES LIKE 't%';
# 5.1 End of Test
SET GLOBAL max_binlog_cache_size=@saved_max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=@saved_binlog_cache_size;
DROP TABLE t1;