diff options
Diffstat (limited to 'mysql-test/lib/My/Options.pm')
| -rw-r--r-- | mysql-test/lib/My/Options.pm | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm index 40f05c41d1c..3bfbe1fc90e 100644 --- a/mysql-test/lib/My/Options.pm +++ b/mysql-test/lib/My/Options.pm @@ -67,9 +67,6 @@ sub _split_option { elsif ($option=~ /^(.*)=(.*)$/){ return ($1, $2) } - elsif ($option=~ /^-O$/){ - return (undef, undef); - } die "Unknown option format '$option'"; } @@ -169,20 +166,11 @@ sub toSQL { my @sql; foreach my $option (@options) { - my ($name, $value)= _split_option($option); - #print "name: $name\n"; + my ($sql_name, $value)= _split_option($option); + #print "name: $sql_name\n"; #print "value: $value\n"; - if ($name =~ /^O, (.*)/){ - push(@sql, "SET GLOBAL $1=$value"); - } - elsif ($name =~ /^set-variable=(.*)/){ - push(@sql, "SET GLOBAL $1=$value"); - } - else { - my $sql_name= $name; - $sql_name=~ s/-/_/g; - push(@sql, "SET GLOBAL $sql_name=$value"); - } + $sql_name=~ s/-/_/g; + push(@sql, "SET GLOBAL $sql_name=$value"); } return join("; ", @sql); } |