mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
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.
This commit is contained in:
parent
a4dc526fc7
commit
f2cfcd91f5
6 changed files with 82 additions and 4 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue