From 4dde684315e64fb151963c3c54cafa33fd9702c9 Mon Sep 17 00:00:00 2001
From: Serge Kozlov <Serge.Kozlov@oracle.com>
Date: Mon, 9 May 2011 23:26:41 +0400
Subject: [PATCH] automerge 5.1->5.5

---
 mysql-test/suite/binlog/t/binlog_bug23533.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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%';