summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorSerge Kozlov <Serge.Kozlov@oracle.com>2011-05-09 23:26:41 +0400
committerSerge Kozlov <Serge.Kozlov@oracle.com>2011-05-09 23:26:41 +0400
commit724cc4002387c3f8cf02e7039482440514559172 (patch)
tree70b8584c105da54162b3d95676360a2cab728e43 /mysql-test/suite
parent8f79579925d6c9ca68703d79855251c3df6bb096 (diff)
downloadmariadb-git-724cc4002387c3f8cf02e7039482440514559172.tar.gz
automerge 5.1->5.5
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/binlog/t/binlog_bug23533.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_bug23533.test b/mysql-test/suite/binlog/t/binlog_bug23533.test
index c05abe788c6..ca610e399e4 100644
--- a/mysql-test/suite/binlog/t/binlog_bug23533.test
+++ b/mysql-test/suite/binlog/t/binlog_bug23533.test
@@ -35,7 +35,7 @@ connect(default,localhost,root,,test);
# Copied data from t1 into t2 large than max_binlog_cache_size
START TRANSACTION;
---error 1197
+--error ER_TRANS_CACHE_FULL
CREATE TABLE t2 SELECT * FROM t1;
COMMIT;
SHOW TABLES LIKE 't%';