diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-13 18:26:03 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-13 18:26:03 +0400 |
| commit | f2cfcd91f56d81d40b1f5e2dbb5b643dc207bf53 (patch) | |
| tree | fa898c80f51bb017e15718f18e6d680db393ba52 /mysql-test/mysql-test-run.pl | |
| parent | a4dc526fc7b33891b6d79d36c5abc198c89a53c8 (diff) | |
| download | mariadb-git-f2cfcd91f56d81d40b1f5e2dbb5b643dc207bf53.tar.gz | |
MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and above
Allow only one level of symlink recursion in mysql_tzdata_to_sql,
to avoid infinite loops.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e0dd01a9266..14104a9c423 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2298,6 +2298,13 @@ sub environment_setup { "$path_client_bindir/perror"); $ENV{'MY_PERROR'}= native_path($exe_perror); + # ---------------------------------------------------- + # 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); + # Create an environment variable to make it possible # to detect that valgrind is being used from test cases $ENV{'VALGRIND_TEST'}= $opt_valgrind; |