diff options
| author | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-06-04 15:02:40 +0300 |
|---|---|---|
| committer | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-06-04 15:02:40 +0300 |
| commit | be99c5d331332f467697e6a0ff31182bea4a689e (patch) | |
| tree | c920637995bb9acac3301616aa306510ab860726 /mysql-test/r/multi_update.result | |
| parent | dd085bacb2d2876320021cfb6958cc35e0228649 (diff) | |
| download | mariadb-git-be99c5d331332f467697e6a0ff31182bea4a689e.tar.gz | |
Bug #27716 multi-update did partially and has not binlogged
manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode.
mysql-test/r/innodb.result:
results changed because of some more queries are added
mysql-test/r/multi_update.result:
results changed
mysql-test/r/rpl_row_basic_11bugs.result:
results changed
mysql-test/t/innodb.test:
error code is diff in 5.0
mysql-test/t/multi_update.test:
making explicit comments and forcing execution in mixed (stmt) mode.
mysql-test/t/rpl_row_basic_11bugs.test:
checking how binlogging works when a query on non-ta table completed partly.
sql/sql_update.cc:
manual merge after authomatic one failed (semantic drift)
Diffstat (limited to 'mysql-test/r/multi_update.result')
| -rw-r--r-- | mysql-test/r/multi_update.result | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 7b0b917cf1a..55e47756312 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -614,27 +614,28 @@ CREATE TABLE `t2` ( `b` int(11) default NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ; +set @@session.binlog_format= mixed; insert into t1 values (1,1),(2,2); insert into t2 values (1,1),(4,4); reset master; UPDATE t2,t1 SET t2.a=t1.a+2; -ERROR 23000: Duplicate entry '3' for key 1 +ERROR 23000: Duplicate entry '3' for key 'PRIMARY' select * from t2 /* must be (3,1), (4,4) */; a b 3 1 4 4 show master status /* there must be the UPDATE query event */; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 189 +master-bin.000001 197 delete from t1; delete from t2; insert into t1 values (1,2),(3,4),(4,4); insert into t2 values (1,2),(3,4),(4,4); reset master; UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; -ERROR 23000: Duplicate entry '4' for key 1 +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 204 +master-bin.000001 212 drop table t1, t2; end of tests |