From 62a32540fc8ff953ff0bbf360ffa273d0d2e28c4 Mon Sep 17 00:00:00 2001
From: Patrick Crews <patrick.crews@sun.com>
Date: Fri, 12 Jun 2009 14:40:02 +0100
Subject: [PATCH] Bug#44920: MTR2 is not processing master.opt input properly
 on Windows

Re-enabled tests main.init_connect and rpl.rpl_init_slave.test for non-Windows
platforms.

Please remove this code upon fixing the bug.
---
 mysql-test/suite/rpl/t/disabled.def        | 1 -
 mysql-test/suite/rpl/t/rpl_init_slave.test | 6 ++++++
 mysql-test/t/disabled.def                  | 1 -
 mysql-test/t/init_connect.test             | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
index fcc3d56a9f5..38fc9e21322 100644
--- a/mysql-test/suite/rpl/t/disabled.def
+++ b/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
diff --git a/mysql-test/suite/rpl/t/rpl_init_slave.test b/mysql-test/suite/rpl/t/rpl_init_slave.test
index 58d1f6bdc01..dd58b973fca 100644
--- a/mysql-test/suite/rpl/t/rpl_init_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_init_slave.test
@@ -1,3 +1,9 @@
+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;
 
 #
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index af4eb44b464..6d8f0af0c28 100644
--- a/mysql-test/t/disabled.def
+++ b/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
diff --git a/mysql-test/t/init_connect.test b/mysql-test/t/init_connect.test
index b6bac5f65fa..1e93d0d671f 100644
--- a/mysql-test/t/init_connect.test
+++ b/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