database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Remember dynamically set options as started

Browse Source
This commit is contained in:
msvensson@pilot.mysql.com
2008-01-08 15:47:04 +01:00
parent 5a026a8679
commit 284f28d78f
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/lib/My/Options.pm
View File

@ -168,9 +168,14 @@ sub toSQL {
foreach my $option (@options) { foreach my $option (@options) {
my ($name, $value)= _split_option($option); my ($name, $value)= _split_option($option);
#print "name: $name\n"; #print "name: $name\n";
#print "value: $value\n";
if ($name =~ /^O, (.*)/){ if ($name =~ /^O, (.*)/){
push(@sql, "SET GLOBAL $1=$value"); push(@sql, "SET GLOBAL $1=$value");
} else { }
elsif ($name =~ /^set-variable=(.*)/){
push(@sql, "SET GLOBAL $1=$value");
}
else {
my $sql_name= $name; my $sql_name= $name;
$sql_name=~ s/-/_/g; $sql_name=~ s/-/_/g;
push(@sql, "SET GLOBAL $sql_name=$value"); push(@sql, "SET GLOBAL $sql_name=$value");

8
mysql-test/mysql-test-run.pl
View File

@ -2833,16 +2833,14 @@ sub server_need_restart {
my $query= My::Options::toSQL(@diff_opts); my $query= My::Options::toSQL(@diff_opts);
mtr_verbose("Attempting dynamic switch '$query'"); mtr_verbose("Attempting dynamic switch '$query'");
if (run_query($tinfo, $server, $query)){ if (run_query($tinfo, $server, $query)){
mtr_verbose("Restart: Dynamic switch failed");
return 1;
}
else
{
mtr_verbose("Restart: running with different options '" . mtr_verbose("Restart: running with different options '" .
join(" ", @{$extra_opts}) . "' != '" . join(" ", @{$extra_opts}) . "' != '" .
join(" ", @{$server->{'started_opts'}}) . "'" ); join(" ", @{$server->{'started_opts'}}) . "'" );
return 1; return 1;
} }
# Remember the dynamically set options
$server->{'started_opts'}= $extra_opts;
} }
} }