List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:May 16 2010 5:27pm
Subject:bzr push into mysql-5.1-bugteam branch (aelkin:3384 to 3385) Bug#50942
View as plain text  
 3385 Andrei Elkin	2010-05-16 [merge]
      pushing bug#50942 fixes to 5.1-bt

    modified:
      mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
 3384 Alfranio Correia	2010-05-16
      BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in mixed
      mode
            
      Post-push fix after backporting the patch to 5.1-bugteam:
      
        1 - changed the name of some variables to be equivalent to pe.
        2 - fixed that patch to mark a statement as unsafe when both a
        self-logging eng. and regular eng. are accessed and one of them
        is updated.

    modified:
      sql/sql_base.cc
=== modified file 'mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test'
--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test	2008-02-28 11:21:44 +0000
+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test	2010-05-04 19:31:49 +0000
@@ -214,7 +214,7 @@ CREATE TABLE t5 (a int, PRIMARY KEY (a))
 
 # execute
  --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
  select count(*) from t1 /* must be 1 */;

=== modified file 'mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result'
--- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2010-03-28 11:57:33 +0000
+++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2010-05-04 19:31:49 +0000
@@ -879,11 +879,11 @@ delete from t4;
 insert into t3 values (1,1),(2,2);
 insert into t4 values (1,1),(2,2);
 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'
 select count(*) from t1 /* must be 1 */;
 count(*)
-2
+1
 drop table t4;
 delete from t1;
 delete from t2;

=== modified file 'mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result'
--- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2010-03-28 11:57:33 +0000
+++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2010-05-04 19:31:49 +0000
@@ -802,7 +802,7 @@ delete from t4;
 insert into t3 values (1,1),(2,2);
 insert into t4 values (1,1),(2,2);
 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'
 select count(*) from t1 /* must be 1 */;
 count(*)


Attachment: [text/bzr-bundle] bzr/aelkin@mysql.com-20100516170332-x8priwrdjwolc065.bundle
Thread
bzr push into mysql-5.1-bugteam branch (aelkin:3384 to 3385) Bug#50942Andrei Elkin16 May