mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
mysql-test-run.pl:
Added search for 'my_print_defaults' when running from source tree on Windows trigger-grant.test, trigger-compat.test: Removed --text from grep, not portable mysql-test/t/trigger-compat.test: Removed --text from grep, not portable mysql-test/t/trigger-grant.test: Removed --text from grep, not portable mysql-test/mysql-test-run.pl: Added search for 'my_print_defaults' when running from source tree on Windows
This commit is contained in:
@ -927,6 +927,9 @@ sub executable_setup () {
|
||||
"$path_client_bindir/mysqld-debug",);
|
||||
$path_language= mtr_path_exists("$glob_basedir/share/english/");
|
||||
$path_charsetsdir= mtr_path_exists("$glob_basedir/share/charsets");
|
||||
|
||||
$exe_my_print_defaults=
|
||||
mtr_exe_exists("$path_client_bindir/my_print_defaults");
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -937,6 +940,8 @@ sub executable_setup () {
|
||||
|
||||
$exe_im= mtr_exe_exists(
|
||||
"$glob_basedir/server-tools/instance-manager/mysqlmanager");
|
||||
$exe_my_print_defaults=
|
||||
mtr_exe_exists("$glob_basedir/extra/my_print_defaults");
|
||||
}
|
||||
|
||||
if ( $glob_use_embedded_server )
|
||||
@ -963,8 +968,6 @@ sub executable_setup () {
|
||||
$exe_mysql= mtr_exe_exists("$path_client_bindir/mysql");
|
||||
$exe_mysql_fix_system_tables=
|
||||
mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables");
|
||||
$exe_my_print_defaults=
|
||||
mtr_script_exists("$glob_basedir/extra/my_print_defaults");
|
||||
$path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools");
|
||||
$exe_ndb_mgm= "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm";
|
||||
}
|
||||
@ -982,7 +985,7 @@ sub executable_setup () {
|
||||
mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables",
|
||||
"$glob_basedir/scripts/mysql_fix_privilege_tables");
|
||||
$exe_my_print_defaults=
|
||||
mtr_script_exists("$path_client_bindir/my_print_defaults");
|
||||
mtr_exe_exists("$path_client_bindir/my_print_defaults");
|
||||
|
||||
$path_language= mtr_path_exists("$glob_basedir/share/mysql/english/",
|
||||
"$glob_basedir/share/english/");
|
||||
|
Reference in New Issue
Block a user