From 0657f102afe0a683c6ef9e330828af977dd5433c Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 14 Nov 2013 16:09:32 +0400 Subject: [PATCH] MDEV-5290 MTR cannot find mysql_tzinfo_to_sql on Windows mysql_tzinfo_to_sql is not compiled under Windows in the pre-5.5 versions. Do not set the MYSQL_TZINFO_TO_SQL variable in the version prior to 5.5 under Windows. --- mysql-test/mysql-test-run.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 14104a9c423..e4beae1c10b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2301,9 +2301,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", - "$path_client_bindir/mysql_tzinfo_to_sql"); - $ENV{'MYSQL_TZINFO_TO_SQL'}= native_path($exe_mysql_tzinfo_to_sql); + if (!IS_WINDOWS) { + my $exe_mysql_tzinfo_to_sql= mtr_exe_exists("$basedir/sql$opt_vs_config/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