diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-10-01 19:44:53 +0300 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-10-01 19:44:53 +0300 |
| commit | d91aa57c38e9baf0bbf31a596e79bea2504e50bb (patch) | |
| tree | e2849e3cfc039882029b2eb6059cefa89b85f0de /mysql-test/r/multi_update.result | |
| parent | c676cebbea734691b41bf7e8edcbe61e74a53f62 (diff) | |
| download | mariadb-git-d91aa57c38e9baf0bbf31a596e79bea2504e50bb.tar.gz | |
backporting bug@27808 fixes
Diffstat (limited to 'mysql-test/r/multi_update.result')
| -rw-r--r-- | mysql-test/r/multi_update.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 449333a4ae6..4f22029814c 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -604,7 +604,7 @@ a b 4 4 show master status /* there must be the UPDATE query event */; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 206 +master-bin.000001 207 delete from t1; delete from t2; insert into t1 values (1,2),(3,4),(4,4); @@ -614,7 +614,7 @@ UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; ERROR 23000: Duplicate entry '4' for key 'PRIMARY' show master status /* there must be the UPDATE query event */; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 221 +master-bin.000001 222 drop table t1, t2; set @@session.binlog_format= @sav_binlog_format; drop table if exists t1, t2, t3; |