Bug#51393 : remove mtr_fix_privilege_tables from MTR v1
This commit is contained in:
parent
310c949e3d
commit
c584f3d609
@ -152,8 +152,6 @@ our $exe_mysqldump;
|
|||||||
our $exe_mysqlslap;
|
our $exe_mysqlslap;
|
||||||
our $exe_mysqlimport;
|
our $exe_mysqlimport;
|
||||||
our $exe_mysqlshow;
|
our $exe_mysqlshow;
|
||||||
our $exe_mysql_fix_system_tables;
|
|
||||||
our $file_mysql_fix_privilege_tables;
|
|
||||||
our $exe_mysqltest;
|
our $exe_mysqltest;
|
||||||
our $exe_ndbd;
|
our $exe_ndbd;
|
||||||
our $exe_ndb_mgmd;
|
our $exe_ndb_mgmd;
|
||||||
@ -1680,19 +1678,7 @@ sub executable_setup () {
|
|||||||
$exe_mysql_upgrade= "";
|
$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())
|
if ( ! $opt_skip_ndbcluster and executable_setup_ndb())
|
||||||
{
|
{
|
||||||
@ -2159,21 +2145,6 @@ sub environment_setup () {
|
|||||||
$ENV{'MYSQL_UPGRADE'}= mysql_upgrade_arguments();
|
$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
|
# Setup env so childs can execute my_print_defaults
|
||||||
|
Loading…
x
Reference in New Issue
Block a user