diff options
| author | unknown <knielsen@mysql.com> | 2006-03-28 10:07:03 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-03-28 10:07:03 +0200 |
| commit | fa780d44c64df04bb78d097e984b40fdf11edc84 (patch) | |
| tree | 6724cacb8e05bc9947fee00d5a2dd6c47605ce66 /mysql-test | |
| parent | 73970addd82584a9ec6ad4c95ba5d54dfe0f640c (diff) | |
| parent | 421ae80b0ccbfa33856fe1f079bc3cd6acf44175 (diff) | |
| download | mariadb-git-fa780d44c64df04bb78d097e984b40fdf11edc84.tar.gz | |
Manual merge.
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 3a3dedfd963..6b87d5ddd6c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1063,6 +1063,8 @@ sub executable_setup () { $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest"); $exe_mysql_client_test= mtr_exe_exists("$glob_basedir/tests/mysql_client_test", + "$glob_basedir/tests/release/mysql_client_test", + "$glob_basedir/tests/debug/mysql_client_test", "$path_client_bindir/mysql_client_test", "/usr/bin/false"); } @@ -1074,7 +1076,8 @@ sub executable_setup () { $exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin"); $exe_mysql= mtr_exe_exists("$path_client_bindir/mysql"); $exe_mysql_fix_system_tables= - mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables"); + mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables", + "/usr/bin/false"); $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools"); $exe_ndb_mgm= "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm"; } @@ -1090,7 +1093,8 @@ sub executable_setup () { $exe_mysql= mtr_exe_exists("$path_client_bindir/mysql"); $exe_mysql_fix_system_tables= mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables", - "$glob_basedir/scripts/mysql_fix_privilege_tables"); + "$glob_basedir/scripts/mysql_fix_privilege_tables", + "/usr/bin/false"); $exe_my_print_defaults= mtr_exe_exists("$path_client_bindir/my_print_defaults"); @@ -1126,6 +1130,8 @@ sub executable_setup () { $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest"); $exe_mysql_client_test= mtr_exe_exists("$path_client_bindir/mysql_client_test", + "$glob_basedir/tests/release/mysql_client_test", + "$glob_basedir/tests/debug/mysql_client_test", "/usr/bin/false"); # FIXME temporary } |