diff options
| author | unknown <Li-Bing.Song@sun.com> | 2010-05-26 22:34:25 +0800 |
|---|---|---|
| committer | unknown <Li-Bing.Song@sun.com> | 2010-05-26 22:34:25 +0800 |
| commit | 71e534542bfb6b2cc40909a8bb975fc7564998d0 (patch) | |
| tree | 20ebc2f49e17beacbc4a6ebcaa6727f8eb8e765d /mysql-test/t/multi_update.test | |
| parent | 42d91c688c27f9b2496ec6e82535b69ec5d69697 (diff) | |
| parent | 8f8e1d6fb85d4be1e8e44beb22b26a72f76ac84e (diff) | |
| download | mariadb-git-71e534542bfb6b2cc40909a8bb975fc7564998d0.tar.gz | |
Manual merge
Diffstat (limited to 'mysql-test/t/multi_update.test')
| -rw-r--r-- | mysql-test/t/multi_update.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index 0db6c44873d..7a81ad496b4 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -586,7 +586,7 @@ reset master; UPDATE t2,t1 SET t2.a=t1.a+2; # check select * from t2 /* must be (3,1), (4,4) */; -show master status /* there must be the UPDATE query event */; +source include/show_binlog_events.inc; # B. testing multi_update::send_error() ineffective update # (as there is a policy described at mysql_update() still go to binlog) @@ -597,7 +597,7 @@ insert into t2 values (1,2),(3,4),(4,4); reset master; --error ER_DUP_ENTRY UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; -show master status /* there must be the UPDATE query event */; +source include/show_binlog_events.inc; # cleanup drop table t1, t2; |