MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Patrick Crews Date:July 1 2008 7:19pm
Subject:bzr push into mysql-5.1 branch (pcrews:2681 to 2682) Bug#37200
View as plain text  
 2682 Patrick Crews	2008-07-01 [merge]
      upmerge into 5.1

 2681 Sven Sandberg	2008-06-30
      BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuild
      Problem: rpl_switch_stm_row_mixed did not wait until row events generated by
      INSERT DELAYED were written to the master binlog before it synchronized slave
      with master. This caused sporadic errors where these rows were missing on
      Fix: wait until all rows appear on the slave.
      This is a backport, applying the same to 5.1-bugteam as was previously
      applied to 6.0-rpl

=== modified file 'mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test'
--- a/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test	2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test	2008-07-01 18:44:47 +0000
@@ -10,11 +10,6 @@
 # 2008-06-06 mleich Create this this variant for the embedded server.
-let $value= query_get_value(SHOW VARIABLES LIKE 'version_compile_os',Value,1);
-if (`SELECT '$value' LIKE 'apple-darwin%'`)
-   skip Bug#37380 Test funcs_1.is_columns_myisam_embedded fails on OS X;
 if (`SELECT VERSION() NOT LIKE '%embedded%'`)
    --skip Test requires: embedded server

bzr push into mysql-5.1 branch (pcrews:2681 to 2682) Bug#37200Patrick Crews1 Jul