automerge

mysql-test/suite/rpl/t/disabled.def

@@ -11,4 +11,3 @@
 ##############################################################################
 
 rpl_cross_version      : Bug#42311 2009-03-27 joro rpl_cross_version fails on macosx
-rpl_init_slave         : Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows

mysql-test/suite/rpl/t/rpl_init_slave.test

+if(`SELECT CONVERT(@@version_compile_os using latin1) IN ("Win32", "Win64", "Windows")`)
+{
+--skip Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows
+}
+
+
 source include/master-slave.inc;
 
 #

mysql-test/t/disabled.def

@@ -12,4 +12,3 @@
 kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 innodb_bug39438          : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
-init_connect             : Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows

mysql-test/t/init_connect.test

@@ -2,6 +2,11 @@
 # Test of init_connect variable
 #
 
+if(`SELECT CONVERT(@@version_compile_os using latin1) IN ("Win32", "Win64", "Windows")`)
+{
+--skip Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows
+}
+
 # should work with embedded server after mysqltest is fixed
 --source include/not_embedded.inc