From 79bdcc49c9f5563ab6a3e148239f1c7eddc4076e Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Wed, 14 Jun 2006 20:36:23 +0200
Subject: [PATCH] Remove opt_local, noone knows what it should do

---
 mysql-test/lib/mtr_stress.pl | 2 +-
 mysql-test/mysql-test-run.pl | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/mysql-test/lib/mtr_stress.pl b/mysql-test/lib/mtr_stress.pl
index ccfe634ae94..a7d4b68b69d 100644
--- a/mysql-test/lib/mtr_stress.pl
+++ b/mysql-test/lib/mtr_stress.pl
@@ -25,7 +25,7 @@ sub run_stress_test ()
 
   mtr_report("Starting stress testing\n");
 
-  if ( ! $::glob_use_embedded_server and ! $::opt_local_master )
+  if ( ! $::glob_use_embedded_server )
   {
     if ( ! mysqld_start($::master->[0],[],[]) )
     {
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 1105b0010b6..6fb2ba42128 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -237,8 +237,6 @@ our $opt_gprof_dir;
 our $opt_gprof_master;
 our $opt_gprof_slave;
 
-our $opt_local;
-
 our $master;                    # Will be struct in C
 our $slave;
 our $clusters;
@@ -658,7 +656,6 @@ sub command_line_setup () {
              'comment=s'                => \$opt_comment,
              'debug'                    => \$opt_debug,
              'fast'                     => \$opt_fast,
-             'local'                    => \$opt_local,
              'netware'                  => \$opt_netware,
              'old-master'               => \$opt_old_master,
              'reorder'                  => \$opt_reorder,
@@ -758,11 +755,6 @@ sub command_line_setup () {
   # Do sanity checks of command line arguments
   # --------------------------------------------------------------------------
 
-  if ( $opt_extern and $opt_local )
-  {
-    mtr_error("Can't use --extern and --local at the same time");
-  }
-
   if ( ! $opt_socket )
   {     # FIXME set default before reading options?
 #    $opt_socket=  '@MYSQL_UNIX_ADDR@';
@@ -4206,7 +4198,6 @@ Deprecated options
 
 Options not yet described, or that I want to look into more
   local                 
-  local-master          
   netware               
   old-master            
   sleep=SECONDS