summaryrefslogtreecommitdiff
path: root/mysql-test/t/sp_trans_log.test
diff options
context:
space:
mode:
authorunknown <Li-Bing.Song@sun.com>2010-05-26 22:34:25 +0800
committerunknown <Li-Bing.Song@sun.com>2010-05-26 22:34:25 +0800
commit71e534542bfb6b2cc40909a8bb975fc7564998d0 (patch)
tree20ebc2f49e17beacbc4a6ebcaa6727f8eb8e765d /mysql-test/t/sp_trans_log.test
parent42d91c688c27f9b2496ec6e82535b69ec5d69697 (diff)
parent8f8e1d6fb85d4be1e8e44beb22b26a72f76ac84e (diff)
downloadmariadb-git-71e534542bfb6b2cc40909a8bb975fc7564998d0.tar.gz
Manual merge
Diffstat (limited to 'mysql-test/t/sp_trans_log.test')
-rw-r--r--mysql-test/t/sp_trans_log.test1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/t/sp_trans_log.test b/mysql-test/t/sp_trans_log.test
index 68467f71ee1..f162ee5cea6 100644
--- a/mysql-test/t/sp_trans_log.test
+++ b/mysql-test/t/sp_trans_log.test
@@ -34,7 +34,6 @@ end|
reset master|
--error ER_DUP_ENTRY
insert into t2 values (bug23333(),1)|
---replace_column 2 # 5 # 6 #
# the following must show there is (are) events after the query */
source include/show_binlog_events.inc|
select count(*),@a from t1 /* must be 1,1 */|