diff options
Diffstat (limited to 'mysql-test/lib')
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index b4d2870e546..5d9b0dbb221 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -152,6 +152,7 @@ our $exe_mysqldump; our $exe_mysqlslap; our $exe_mysqlimport; our $exe_mysqlshow; +our $file_mysql_fix_privilege_tables; our $exe_mysqltest; our $exe_ndbd; our $exe_ndb_mgmd; @@ -803,7 +804,7 @@ sub command_line_setup () { "$glob_basedir/sql/share", "$glob_basedir/share"); - $path_language= mtr_path_exists("$path_share/english"); + $path_language= mtr_path_exists("$path_share"); $path_charsetsdir= mtr_path_exists("$path_share/charsets"); @@ -1466,7 +1467,7 @@ sub collect_mysqld_features () { # # --datadir must exist, mysqld will chdir into it # - my $list= `$exe_mysqld --no-defaults --datadir=$tmpdir --language=$path_language --skip-grant-tables --verbose --help`; + my $list= `$exe_mysqld --no-defaults --datadir=$tmpdir --lc-messages-dir=$path_language --skip-grant-tables --verbose --help`; foreach my $line (split('\n', $list)) { @@ -1678,7 +1679,11 @@ sub executable_setup () { $exe_mysql_upgrade= ""; } - + # Look for mysql_fix_privilege_tables.sql script + $file_mysql_fix_privilege_tables= + mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql", + "$glob_basedir/share/mysql_fix_privilege_tables.sql", + "$glob_basedir/share/mysql/mysql_fix_privilege_tables.sql"); if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) { @@ -1798,7 +1803,7 @@ sub mysql_client_test_arguments() if ( $glob_use_embedded_server ) { mtr_add_arg($args, - " -A --language=$path_language"); + " -A --lc-messages-dir=$path_language"); mtr_add_arg($args, " -A --datadir=$slave->[0]->{'path_myddir'}"); mtr_add_arg($args, @@ -2145,6 +2150,7 @@ sub environment_setup () { $ENV{'MYSQL_UPGRADE'}= mysql_upgrade_arguments(); } + $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables; # ---------------------------------------------------- # Setup env so childs can execute my_print_defaults @@ -3134,7 +3140,7 @@ sub install_db ($$) { if ( ! $glob_netware ) { - mtr_add_arg($args, "--language=%s", $path_language); + mtr_add_arg($args, "--lc-messages-dir=%s", $path_language); mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir); } @@ -3259,10 +3265,10 @@ socket = $instance->{path_sock} pid-file = $instance->{path_pid} port = $instance->{port} datadir = $instance->{path_datadir} +lc-messages-dir = $path_language log = $instance->{path_datadir}/mysqld$server_id.log log-error = $instance->{path_datadir}/mysqld$server_id.err.log log-slow-queries = $instance->{path_datadir}/mysqld$server_id.slow.log -language = $path_language character-sets-dir = $path_charsetsdir basedir = $path_my_basedir server_id = $server_id @@ -3579,7 +3585,7 @@ sub run_testcase ($) { { mtr_timer_stop_all($glob_timers); mtr_report("\nServers started, exiting"); - if ($glob_win32_perl)
+ if ($glob_win32_perl) { #ActiveState perl hangs when using normal exit, use POSIX::_exit instead use POSIX qw[ _exit ]; @@ -3869,8 +3875,8 @@ sub mysqld_arguments ($$$$) { mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix); } - mtr_add_arg($args, "%s--default-character-set=latin1", $prefix); - mtr_add_arg($args, "%s--language=%s", $prefix, $path_language); + mtr_add_arg($args, "%s--character-set-server=latin1", $prefix); + mtr_add_arg($args, "%s--lc-messages-dir=%s", $prefix, $path_language); mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix); # Increase default connect_timeout to avoid intermittent |