From 6cd71817bd0e6ea940704551c754bd33d86f601b Mon Sep 17 00:00:00 2001
From: Patrick Crews <patrick.crews@sun.com>
Date: Mon, 6 Jul 2009 18:20:17 -0400
Subject: [PATCH 1/2] 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        | 2 ++
 mysql-test/suite/rpl/t/rpl_init_slave.test | 6 ------
 mysql-test/t/disabled.def                  | 2 ++
 mysql-test/t/init_connect.test             | 5 -----
 4 files changed, 4 insertions(+), 11 deletions(-)

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

From 88d3a44b8fc9c4d4457777dda57fd5846730ee21 Mon Sep 17 00:00:00 2001
From: Patrick Crews <patrick.crews@sun.com>
Date: Tue, 7 Jul 2009 10:19:38 -0400
Subject: [PATCH 2/2] Bug#37746: Arithmetic range ("int") is smaller than
 expected

Added code to the .test file to skip this test on Win64 for PB2 stability.
Please remove this code when the bug is fixed.
---
 mysql-test/suite/funcs_1/t/storedproc.test | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mysql-test/suite/funcs_1/t/storedproc.test b/mysql-test/suite/funcs_1/t/storedproc.test
index 67fc33269a3..16c4d61bf58 100644
--- a/mysql-test/suite/funcs_1/t/storedproc.test
+++ b/mysql-test/suite/funcs_1/t/storedproc.test
@@ -10,6 +10,17 @@
 #                  
 ############################################################################
 
+# Bug#37746 - Arithmetic range ("int") is smaller than expected
+# This code is in place to ensure this test is only skipped
+# for the Win64 platform
+if(`SELECT CONVERT(@@version_compile_os using latin1) IN ("Win64")`)
+{
+--skip Bug#37746 2009-07-07 pcrews Arithmetic range ("int") is smaller than expected
+}
+
+
+
+
 # This test cannot be used for the embedded server because we check here
 # privileges.
 --source include/not_embedded.inc