diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-13 19:16:35 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-13 19:16:35 +0400 |
| commit | d7463f8e59fdc0dd18747dd500998ac4c8f83dff (patch) | |
| tree | 4f51344826b7aa6d6715fbdb6bb9ea9ca4600379 /mysql-test/mysql-test-run.pl | |
| parent | f3a78f392dad24391c19464731833e2bdf19bdef (diff) | |
| parent | e4608eb3c161709df8d81dfba98ef67a4957d3ee (diff) | |
| download | mariadb-git-d7463f8e59fdc0dd18747dd500998ac4c8f83dff.tar.gz | |
Merge 5.3 -> 5.5
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 27088df0a81..7fa9504f927 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2490,6 +2490,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; |