Bug#42589 mysql_fix_privilege_tables.sh to be deprecated

 - Remove remnants of "mysql_fix_privilege_tables.sh"(again)

4 files changed, 1 insertions, 167 deletions

diff --git a/mysql-test/include/default_my.cnf b/mysql-test/include/default_my.cnf
index d77fee0e200..fc2bd5d1140 100644
--- a/mysql-test/include/default_my.cnf
+++ b/mysql-test/include/default_my.cnf
@@ -12,14 +12,6 @@ log-bin=                 master-bin
 [mysqlbinlog]
 disable-force-if-open
 
-# mysql_fix_privilege_tables.sh does not read from [client] so it
-# need its own section
-[mysql_fix_privilege_tables]
-socket=                  @client.socket
-port=                    @client.port
-user=                    @client.user
-password=                @client.password
-
 [ENV]
 MASTER_MYPORT=           @mysqld.1.port
 MASTER_MYSOCK=           @mysqld.1.socket
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl
index 86ad5c485c1..c319036b193 100755
--- a/mysql-test/lib/v1/mysql-test-run.pl
+++ b/mysql-test/lib/v1/mysql-test-run.pl
@@ -152,7 +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;
@@ -1673,14 +1672,6 @@ 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",
@@ -2152,20 +2143,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;
 
   # ----------------------------------------------------
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 17102196f42..ba4fd1ad2b3 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -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
 ;
 
diff --git a/mysql-test/t/system_mysql_db_fix30020.test b/mysql-test/t/system_mysql_db_fix30020.test
deleted file mode 100644
index 0a7d9dad7c9..00000000000
--- a/mysql-test/t/system_mysql_db_fix30020.test
+++ /dev/null
@@ -1,108 +0,0 @@
-# Embedded server doesn't support external clients
---source include/not_embedded.inc
-
-# Don't run this test if $MYSQL_FIX_SYSTEM_TABLES isn't set
-# to the location of mysql_fix_privilege_tables.sql
-if (`SELECT LENGTH("$MYSQL_FIX_SYSTEM_TABLES") <= 0`)
-{
-  skip Test need MYSQL_FIX_SYSTEM_TABLES;
-}
-# check that CSV engine was compiled in, as the test relies on the presence
-# of the log tables (which are CSV-based)
---source include/have_csv.inc
-
-#
-# This is the test for mysql_fix_privilege_tables
-# It checks that a system tables from mysql 3.20
-# can be upgraded to current system table format
-#
-# Note: If this test fails, don't be confused about the errors reported
-# by mysql-test-run This shows warnings generated by
-# mysql_fix_system_tables which should be ignored.
-# Instead, concentrate on the errors in r/system_mysql_db.reject
-
--- disable_result_log
--- disable_query_log
-
-use test;
-
-# create system tables as in mysql-3.20
-
---disable_warnings
-CREATE TABLE db (
-  Host char(60) binary DEFAULT '' NOT NULL,
-  Db char(32) binary DEFAULT '' NOT NULL,
-  User char(16) binary DEFAULT '' NOT NULL,
-  Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  PRIMARY KEY Host (Host,Db,User),
-  KEY User (User)
-)
-engine=MyISAM;
---enable_warnings
-
-INSERT INTO db VALUES ('%','test',   '','Y','Y','Y','Y','Y','Y');
-INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y');
-
---disable_warnings
-CREATE TABLE host (
-  Host char(60) binary DEFAULT '' NOT NULL,
-  Db char(32) binary DEFAULT '' NOT NULL,
-  Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  PRIMARY KEY Host (Host,Db)
-)
-engine=MyISAM;
---enable_warnings
-
---disable_warnings
-CREATE TABLE user (
-  Host char(60) binary DEFAULT '' NOT NULL,
-  User char(16) binary DEFAULT '' NOT NULL,
-  Password char(16),
-  Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Reload_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Shutdown_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  Process_priv enum('N','Y') DEFAULT 'N' NOT NULL,
-  PRIMARY KEY Host (Host,User)
-)
-engine=MyISAM;
---enable_warnings
-
-INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y');
-INSERT INTO user VALUES ('localhost','',    '','N','N','N','N','N','N','N','N','N');
-
-# Call the "shell script" $MYSQL_FIX_SYSTEM_TABLES using system
--- system $MYSQL_FIX_SYSTEM_TABLES --database=test > $MYSQLTEST_VARDIR/log/system_mysql_db_fix30020.log 2>&1
--- enable_query_log
--- enable_result_log
-
--- source include/system_db_struct.inc
-
--- disable_query_log
-
-DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv,
-procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc,
-time_zone, time_zone_leap_second, time_zone_name, time_zone_transition,
-time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index;
-
--- enable_query_log
-
-# check that we dropped all system tables
-show tables;
-
-exit;
-# End of 4.1 tests