Commit 9cda709e authored by unknown's avatar unknown

Remove opt_local, noone knows what it should do


mysql-test/lib/mtr_stress.pl:
  Remove remnant of opt_local_master
parent 6e0e266e
...@@ -25,7 +25,7 @@ sub run_stress_test () ...@@ -25,7 +25,7 @@ sub run_stress_test ()
mtr_report("Starting stress testing\n"); 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],[],[]) ) if ( ! mysqld_start($::master->[0],[],[]) )
{ {
......
...@@ -237,8 +237,6 @@ our $opt_gprof_dir; ...@@ -237,8 +237,6 @@ our $opt_gprof_dir;
our $opt_gprof_master; our $opt_gprof_master;
our $opt_gprof_slave; our $opt_gprof_slave;
our $opt_local;
our $master; # Will be struct in C our $master; # Will be struct in C
our $slave; our $slave;
our $clusters; our $clusters;
...@@ -658,7 +656,6 @@ sub command_line_setup () { ...@@ -658,7 +656,6 @@ sub command_line_setup () {
'comment=s' => \$opt_comment, 'comment=s' => \$opt_comment,
'debug' => \$opt_debug, 'debug' => \$opt_debug,
'fast' => \$opt_fast, 'fast' => \$opt_fast,
'local' => \$opt_local,
'netware' => \$opt_netware, 'netware' => \$opt_netware,
'old-master' => \$opt_old_master, 'old-master' => \$opt_old_master,
'reorder' => \$opt_reorder, 'reorder' => \$opt_reorder,
...@@ -758,11 +755,6 @@ sub command_line_setup () { ...@@ -758,11 +755,6 @@ sub command_line_setup () {
# Do sanity checks of command line arguments # 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 ) if ( ! $opt_socket )
{ # FIXME set default before reading options? { # FIXME set default before reading options?
# $opt_socket= '@MYSQL_UNIX_ADDR@'; # $opt_socket= '@MYSQL_UNIX_ADDR@';
...@@ -4206,7 +4198,6 @@ Deprecated options ...@@ -4206,7 +4198,6 @@ Deprecated options
Options not yet described, or that I want to look into more Options not yet described, or that I want to look into more
local local
local-master
netware netware
old-master old-master
sleep=SECONDS sleep=SECONDS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment