diff options
author | He Zhenxing <hezx@mysql.com> | 2008-08-26 18:07:56 +0800 |
---|---|---|
committer | He Zhenxing <hezx@mysql.com> | 2008-08-26 18:07:56 +0800 |
commit | 6b85127976e39bc9d8d835b5c875fe241d061f41 (patch) | |
tree | bf1069afa8a5aebfcfa88d80c1c4e917a05c20e1 /mysql-test/r/multi_update.result | |
parent | 923f61039ef220b59adf39bf8e9696fc7e533ddc (diff) | |
download | mariadb-git-6b85127976e39bc9d8d835b5c875fe241d061f41.tar.gz |
Cherry picking post fixes for BUG#37051
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 421a63cd54c..aa88b44f5b4 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -627,7 +627,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 197 +master-bin.000001 206 delete from t1; delete from t2; insert into t1 values (1,2),(3,4),(4,4); @@ -637,7 +637,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 212 +master-bin.000001 221 drop table t1, t2; set @@session.binlog_format= @sav_binlog_format; drop table if exists t1, t2, t3; |