database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug#42589 mysql_fix_privilege_tables.sh to be deprecated

Browse Source 
- Remove remnants of "mysql_fix_privilege_tables.sh"(again)
This commit is contained in:
Magnus Blåudd
2009-10-07 15:42:16 +02:00
parent 528ab7bb11
commit 04e99c1009
9 changed files with 6 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mysql-test/mysql-test-run.pl
View File

@ -1635,26 +1635,8 @@ sub client_debug_arg($$) {
}
sub mysql_fix_arguments () {
return "" if ( IS_WINDOWS );
my $exe=
mtr_script_exists("$basedir/scripts/mysql_fix_privilege_tables",
"$path_client_bindir/mysql_fix_privilege_tables");
my $args;
mtr_init_args(\$args);
mtr_add_arg($args, "--defaults-file=%s", $path_config_file);
mtr_add_arg($args, "--basedir=%s", $basedir);
mtr_add_arg($args, "--bindir=%s", $path_client_bindir);
mtr_add_arg($args, "--verbose");
return mtr_args2str($exe, @$args);
}
sub client_arguments ($;$) {
my $client_name= shift;
my $client_name= shift;
my $group_suffix= shift;
my $client_exe= mtr_exe_exists("$path_client_bindir/$client_name");
@ -1943,7 +1925,6 @@ sub environment_setup {
$ENV{'MYSQL_UPGRADE'}= client_arguments("mysql_upgrade");
$ENV{'MYSQLADMIN'}= native_path($exe_mysqladmin);
$ENV{'MYSQL_CLIENT_TEST'}= mysql_client_test_arguments();
$ENV{'MYSQL_FIX_SYSTEM_TABLES'}= mysql_fix_arguments();
$ENV{'EXE_MYSQL'}= $exe_mysql;
# ----------------------------------------------------
@ -2509,14 +2490,6 @@ sub create_config_file_for_extern {
[mysqlbinlog]
character-sets-dir= $path_charsetsdir
# mysql_fix_privilege_tables.sh don't read from [client]
[mysql_fix_privilege_tables]
socket = $opts{'socket'}
port = $opts{'port'}
user = $opts{'user'}
password = $opts{'password'}
EOF
;