bzr commit into mysql-pe branch (patrick.crews:3438)

[Patrick Crews]

#At file:///Users/pcrews/usr/local/bin/data1/work/win_fix/mysql-6.0-bugteam/ based on revid:patrick.crews@stripped

 3438 Patrick Crews	2009-07-07 [merge]
      Merge 5.1-> 6.0

    modified:
      mysql-test/suite/funcs_1/t/storedproc.test
=== modified file 'mysql-test/suite/funcs_1/t/storedproc.test'
--- a/mysql-test/suite/funcs_1/t/storedproc.test	2009-07-06 08:38:21 +0000
+++ b/mysql-test/suite/funcs_1/t/storedproc.test	2009-07-07 14:21:05 +0000
@@ -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


Attachment: [text/bzr-bundle] bzr/[e-mail]