Merge 5.1->5.2

94bef7f9 · Alexander Barkov · 1bb3a0e3 · 0657f102 · 94bef7f9
Commit 94bef7f9 authored Nov 14, 2013 by Alexander Barkov
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +5 -3

No files found.
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2311,9 +2311,11 @@ sub environment_setup {
  # ----------------------------------------------------
  # mysql_tzinfo_to_sql
  # ----------------------------------------------------
-  my $exe_mysql_tzinfo_to_sql= mtr_exe_exists("$basedir/sql$opt_vs_config/mysql_tzinfo_to_sql",
+  if (!IS_WINDOWS) {
-				 "$path_client_bindir/mysql_tzinfo_to_sql");
+    my $exe_mysql_tzinfo_to_sql= mtr_exe_exists("$basedir/sql$opt_vs_config/mysql_tzinfo_to_sql",
-  $ENV{'MYSQL_TZINFO_TO_SQL'}= native_path($exe_mysql_tzinfo_to_sql);
+                                                "$path_client_bindir/mysql_tzinfo_to_sql");
+    $ENV{'MYSQL_TZINFO_TO_SQL'}= native_path($exe_mysql_tzinfo_to_sql);
+  }
  # Create an environment variable to make it possible
  # to detect that valgrind is being used from test cases