Commit cd7fdee0 authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)

Merge pilot.(none):/data/msvensson/mysql/work/my50-work

into  pilot.(none):/data/msvensson/mysql/work/my51-work
parents 40bcf44e 054ab36f
...@@ -233,7 +233,6 @@ my $opt_report_features; ...@@ -233,7 +233,6 @@ my $opt_report_features;
our $opt_check_testcases; our $opt_check_testcases;
our $opt_mark_progress; our $opt_mark_progress;
our $opt_skip;
our $opt_skip_rpl; our $opt_skip_rpl;
our $max_slave_num= 0; our $max_slave_num= 0;
our $max_master_num= 1; our $max_master_num= 1;
...@@ -276,9 +275,6 @@ our $opt_stress_test_duration= 0; ...@@ -276,9 +275,6 @@ our $opt_stress_test_duration= 0;
our $opt_stress_init_file= ""; our $opt_stress_init_file= "";
our $opt_stress_test_file= ""; our $opt_stress_test_file= "";
our $opt_wait_for_master;
our $opt_wait_for_slave;
our $opt_warnings; our $opt_warnings;
our $opt_skip_ndbcluster= 0; our $opt_skip_ndbcluster= 0;
......
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