diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-13 18:34:12 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-13 18:34:12 +0400 |
| commit | e4608eb3c161709df8d81dfba98ef67a4957d3ee (patch) | |
| tree | ea86f48ec1e05f4d39ba76d9f3e20004df7015e7 /mysql-test/mysql-test-run.pl | |
| parent | 7787835520eefb6ff19c1566aec2477cf03239a9 (diff) | |
| parent | 1bb3a0e3c856dd4c5846b41da7962ac3478f7945 (diff) | |
| download | mariadb-git-e4608eb3c161709df8d81dfba98ef67a4957d3ee.tar.gz | |
Merge 5.2 -> 5.3
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 740dea5fa68..918ecf7ab9e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2318,6 +2318,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; |