diff options
| author | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-06-02 17:56:39 +0300 |
|---|---|---|
| committer | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-06-02 17:56:39 +0300 |
| commit | dd085bacb2d2876320021cfb6958cc35e0228649 (patch) | |
| tree | 640d5e7d3c48fece614f95259ddf09c51ecc2bc2 /mysql-test/r/multi_update.result | |
| parent | 075346acc8e5b17a9612718d3eda320762350f3a (diff) | |
| parent | 4bdbc3396ea4335ed1f6d01afe4f557b57b183a3 (diff) | |
| download | mariadb-git-dd085bacb2d2876320021cfb6958cc35e0228649.tar.gz | |
Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
mysql-test/t/innodb.test:
Auto merged
mysql-test/r/innodb.result:
manual merge use local 5.1
mysql-test/r/multi_update.result:
manual merge
mysql-test/t/multi_update.test:
manual merge
sql/sql_update.cc:
manual merge
Diffstat (limited to 'mysql-test/r/multi_update.result')
| -rw-r--r-- | mysql-test/r/multi_update.result | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 6d8e5dfdf2c..7b0b917cf1a 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -604,3 +604,37 @@ id c1 c2 2 test t ppc 9 abc ppc drop table t1, t2; +CREATE TABLE `t1` ( +`a` int(11) NOT NULL auto_increment, +`b` int(11) default NULL, +PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 ; +CREATE TABLE `t2` ( +`a` int(11) NOT NULL auto_increment, +`b` int(11) default NULL, +PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 ; +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 +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 +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 +show master status /* there must be the UPDATE query event */; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 204 +drop table t1, t2; +end of tests |