Bug#44920: MTR2 is not processing master.opt input properly on Windows.

Had attempted to disable this test on Windows only, but the nature of this bug
does not allow for this.  The master.opt file is processed before anything in 
in the actual test.  As a result, we must use disabled.def files to ensure
these tests are skipped on the problematic platforms.

Removed Windows-only code and updated the proper disabled.def files accordingly.

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

@@ -11,3 +11,5 @@
 ##############################################################################
 
 rpl_cross_version      : Bug#42311 2009-03-27 joro rpl_cross_version fails on macosx
+rpl_init_slave         : Bug#44920 2009-07006 pcrews MTR2 is not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
+

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,3 +12,5 @@
 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-07-06 pcrews MTR not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
+

mysql-test/t/init_connect.test

@@ -2,11 +2,6 @@
 # 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