1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pushing bug#50942 fixes to 5.1-bt

Browse Source
This commit is contained in:
Andrei Elkin 2010-05-16 20:03:32 +03:00
commit f59684b86e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test
View File

@ -214,7 +214,7 @@ CREATE TABLE t5 (a int, PRIMARY KEY (a)) ENGINE=InnoDB;
# execute # execute
--error ER_DUP_ENTRY --error ER_DUP_ENTRY
UPDATE t3,t4 SET t3.a=t4.a + bug27417(1); UPDATE t3,t4 SET t3.a = t4.a + bug27417(1) where t3.a = 1;
# check # check
select count(*) from t1 /* must be 1 */; select count(*) from t1 /* must be 1 */;

4
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
View File

@ -879,11 +879,11 @@ delete from t4;
insert into t3 values (1,1),(2,2); insert into t3 values (1,1),(2,2);
insert into t4 values (1,1),(2,2); insert into t4 values (1,1),(2,2);
reset master; reset master;
UPDATE t3,t4 SET t3.a=t4.a + bug27417(1); UPDATE t3,t4 SET t3.a = t4.a + bug27417(1) where t3.a = 1;
ERROR 23000: Duplicate entry '2' for key 'PRIMARY' ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
select count(*) from t1 /* must be 1 */; select count(*) from t1 /* must be 1 */;
count(*) count(*)
2 1
drop table t4; drop table t4;
delete from t1; delete from t1;
delete from t2; delete from t2;

2
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
View File

@ -802,7 +802,7 @@ delete from t4;
insert into t3 values (1,1),(2,2); insert into t3 values (1,1),(2,2);
insert into t4 values (1,1),(2,2); insert into t4 values (1,1),(2,2);
reset master; reset master;
UPDATE t3,t4 SET t3.a=t4.a + bug27417(1); UPDATE t3,t4 SET t3.a = t4.a + bug27417(1) where t3.a = 1;
ERROR 23000: Duplicate entry '2' for key 'PRIMARY' ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
select count(*) from t1 /* must be 1 */; select count(*) from t1 /* must be 1 */;
count(*) count(*)