From: ahmad.abdullateef
Date: October 23 2012 8:11am
Subject: bzr push into mysql-trunk branch (ahmad.abdullateef:4797 to 4798)
 Bug#11755766
List-Archive: http://lists.mysql.com/commits/145098
X-Bug: 11755766
Message-Id: <20121023081124.8912.26439.4798@AHABDULL-IN.idc.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4798 Ahmad Abdullateef	2012-10-23
      BUG#11755766 - MAIN.PERROR-WIN FAILS ON NON-ENGLISH VERSIONS OF
                                  WINDOWS
      
      DESCRIPTION:
      On Non-English systems perror-win test fails.
      
      
      ANALYSIS :
      Since this test generates Error Messages corresponding to
      input Error codes based on the current System Language, when
      it is run on Non-English systems the test fails because there
      is a mismatch in the result generated.
      
      
      FIX :
      Code has been added to skip the test if run on a Non-English system.

    modified:
      mysql-test/t/perror-win.test
 4797 Marc Alff	2012-10-23 [merge]
      Merge mysql-5.6 --> mysql-trunk

    modified:
      mysql-test/suite/perfschema/r/sizing_default.result
      mysql-test/suite/perfschema/r/sizing_high.result
      mysql-test/suite/perfschema/r/sizing_low.result
      mysql-test/suite/perfschema/r/sizing_med.result
      sql/hash_filo.h
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/table_host_cache.cc
=== modified file 'mysql-test/t/perror-win.test'
--- a/mysql-test/t/perror-win.test	2008-11-28 13:12:43 +0000
+++ b/mysql-test/t/perror-win.test	2012-10-23 08:10:51 +0000
@@ -1,6 +1,32 @@
 # Windows-specific tests
 --source include/windows.inc
 --require r/have_perror.require
+
+########################################################
+############# Skip if Non-English Windows
+
+perl;
+open(FILE, ">", "$ENV{MYSQL_TMP_DIR}/syslocale.tmp") or die $!;
+
+if(`systeminfo /FO LIST | find "System Locale"` =~ m/en-us/)
+ {print FILE "let \$non_eng_sys= 0;\n";}
+else
+ {print FILE "let \$non_eng_sys= 1;\n";}
+ 
+close FILE;
+EOF
+
+source $MYSQLTEST_VARDIR/tmp/syslocale.tmp;
+remove_file $MYSQLTEST_VARDIR/tmp/syslocale.tmp;
+
+if ($non_eng_sys)
+{
+  skip Need a English Windows Installation;
+}
+
+############# Skip if Non-English Windows
+########################################################
+
 disable_query_log;
 eval select LENGTH("$MY_PERROR") > 0 as "have_perror";
 enable_query_log;

No bundle (reason: useless for push emails).