diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-22 19:39:36 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-22 19:39:36 +0100 |
| commit | e605213c2a52bb0991853acd9a9d42897613abd6 (patch) | |
| tree | 932b47f0bbfe08a3bfe8237b7312391e07ee6c98 /mysql-test/lib | |
| parent | b29eb4e2824c84171173584fc54e76808d9b212e (diff) | |
| download | mariadb-git-e605213c2a52bb0991853acd9a9d42897613abd6.tar.gz | |
Bug#51393 : remove mtr_fix_privilege_tables from MTR v1
Diffstat (limited to 'mysql-test/lib')
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index 3ea815cb45a..b4d2870e546 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -152,8 +152,6 @@ our $exe_mysqldump; our $exe_mysqlslap; our $exe_mysqlimport; our $exe_mysqlshow; -our $exe_mysql_fix_system_tables; -our $file_mysql_fix_privilege_tables; our $exe_mysqltest; our $exe_ndbd; our $exe_ndb_mgmd; @@ -1680,19 +1678,7 @@ sub executable_setup () { $exe_mysql_upgrade= ""; } - if ( ! $glob_win32 ) - { - # Look for mysql_fix_system_table script - $exe_mysql_fix_system_tables= - mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables", - "$path_client_bindir/mysql_fix_privilege_tables"); - } - - # 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()) { @@ -2159,21 +2145,6 @@ sub environment_setup () { $ENV{'MYSQL_UPGRADE'}= mysql_upgrade_arguments(); } - # ---------------------------------------------------- - # Setup env so childs can execute mysql_fix_system_tables - # ---------------------------------------------------- - if ( !$opt_extern && ! $glob_win32 ) - { - my $cmdline_mysql_fix_system_tables= - "$exe_mysql_fix_system_tables --no-defaults --host=localhost " . - "--user=root --password= " . - "--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " . - "--port=$master->[0]->{'port'} " . - "--socket=$master->[0]->{'path_sock'}"; - $ENV{'MYSQL_FIX_SYSTEM_TABLES'}= $cmdline_mysql_fix_system_tables; - - } - $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables; # ---------------------------------------------------- # Setup env so childs can execute my_print_defaults |