Commit d7d3c56a authored by Bjorn Munch's avatar Bjorn Munch

merge from 5.1-mtr

parents a1212080 20e09b39
...@@ -57,3 +57,13 @@ BEGIN ...@@ -57,3 +57,13 @@ BEGIN
mysql.user; mysql.user;
END|| END||
--
-- Procedure used by test case used to force all
-- servers to restart after testcase and thus skipping
-- check test case after test
--
CREATE DEFINER=root@localhost PROCEDURE force_restart()
BEGIN
SELECT 1 INTO OUTFILE 'force_restart';
END||
...@@ -22,6 +22,33 @@ use My::Platform; ...@@ -22,6 +22,33 @@ use My::Platform;
use File::Temp qw/ tempfile tempdir /; use File::Temp qw/ tempfile tempdir /;
my $hint_mysqld; # Last resort guess for executable path
# If path in core file is 79 chars we assume it's been truncated
# Looks like we can still find the full path using 'strings'
# If that doesn't work, use the hint (mysqld path) as last resort.
sub _verify_binpath {
my ($binary, $core_name)= @_;
my $binpath;
if (length $binary != 79) {
$binpath= $binary;
print "Core generated by '$binpath'\n";
} else {
# Last occurrence of path ending in /mysql*, cut from first /
if (`strings '$core_name' | grep "/mysql[^/. ]*\$" | tail -1` =~ /(\/.*)/) {
$binpath= $1;
print "Guessing that core was generated by '$binpath'\n";
} else {
return unless $hint_mysqld;
$binpath= $hint_mysqld;
print "Wild guess that core was generated by '$binpath'\n";
}
}
return $binpath;
}
sub _gdb { sub _gdb {
my ($core_name)= @_; my ($core_name)= @_;
...@@ -33,7 +60,8 @@ sub _gdb { ...@@ -33,7 +60,8 @@ sub _gdb {
`gdb -c '$core_name' --batch 2>&1` =~ `gdb -c '$core_name' --batch 2>&1` =~
/Core was generated by `([^\s\'\`]+)/; /Core was generated by `([^\s\'\`]+)/;
my $binary= $1 or return; my $binary= $1 or return;
print "Core generated by '$binary'\n";
$binary= _verify_binpath ($binary, $core_name) or return;
# Create tempfile containing gdb commands # Create tempfile containing gdb commands
my ($tmp, $tmp_name) = tempfile(); my ($tmp, $tmp_name) = tempfile();
...@@ -73,7 +101,8 @@ sub _dbx { ...@@ -73,7 +101,8 @@ sub _dbx {
`echo | dbx - '$core_name' 2>&1` =~ `echo | dbx - '$core_name' 2>&1` =~
/Corefile specified executable: "([^"]+)"/; /Corefile specified executable: "([^"]+)"/;
my $binary= $1 or return; my $binary= $1 or return;
print "Core generated by '$binary'\n";
$binary= _verify_binpath ($binary, $core_name) or return;
# Find all threads # Find all threads
my @thr_ids = `echo threads | dbx '$binary' '$core_name' 2>&1` =~ /t@\d+/g; my @thr_ids = `echo threads | dbx '$binary' '$core_name' 2>&1` =~ /t@\d+/g;
...@@ -203,7 +232,7 @@ sub _cdb { ...@@ -203,7 +232,7 @@ sub _cdb {
my $cdb_cmd = "!sym prompts off; !analyze -v; .ecxr; !for_each_frame dv /t;!uniqstack -p;q"; my $cdb_cmd = "!sym prompts off; !analyze -v; .ecxr; !for_each_frame dv /t;!uniqstack -p;q";
my $cdb_output= my $cdb_output=
`cdb -z $core_name -i "$image_path" -y "$symbol_path" -t 0 -lines -c "$cdb_cmd" 2>&1`; `cdb -c "$cdb_cmd" -z $core_name -i "$image_path" -y "$symbol_path" -t 0 -lines 2>&1`;
return if $? >> 8; return if $? >> 8;
return unless $cdb_output; return unless $cdb_output;
...@@ -225,7 +254,8 @@ EOF ...@@ -225,7 +254,8 @@ EOF
sub show { sub show {
my ($class, $core_name)= @_; my ($class, $core_name, $exe_mysqld)= @_;
$hint_mysqld= $exe_mysqld;
# On Windows, rely on cdb to be there... # On Windows, rely on cdb to be there...
if (IS_WINDOWS) if (IS_WINDOWS)
......
...@@ -164,6 +164,9 @@ sub copytree { ...@@ -164,6 +164,9 @@ sub copytree {
copytree("$from_dir/$_", "$to_dir/$_"); copytree("$from_dir/$_", "$to_dir/$_");
next; next;
} }
# Only copy plain files
next unless -f "$from_dir/$_";
copy("$from_dir/$_", "$to_dir/$_"); copy("$from_dir/$_", "$to_dir/$_");
} }
closedir(DIR); closedir(DIR);
......
...@@ -536,7 +536,37 @@ sub wait_any { ...@@ -536,7 +536,37 @@ sub wait_any {
return $proc; return $proc;
} }
#
# Wait for all processes to exit
#
sub wait_all {
while(keys %running)
{
wait_any();
}
}
# #
# Check if any process has exited, but don't wait.
#
# Returns a reference to the SafeProcess that
# exited or undefined
#
sub check_any {
for my $proc (values %running){
if ( $proc->is_child($$) ) {
if (not $proc->wait_one(0)) {
_verbose ("Found exited $proc");
return $proc;
}
}
}
return undef;
}
# Overload string operator # Overload string operator
# and fallback to default functions if no # and fallback to default functions if no
# overloaded function is found # overloaded function is found
......
...@@ -83,6 +83,13 @@ sub exit_status { ...@@ -83,6 +83,13 @@ sub exit_status {
}; };
} }
# threads.pm may not exist everywhere, so use only on Windows.
use if $^O eq "MSWin32", "threads";
use if $^O eq "MSWin32", "threads::shared";
my $win32_spawn_lock :shared;
# #
# Create a new process # Create a new process
...@@ -104,6 +111,8 @@ sub create_process { ...@@ -104,6 +111,8 @@ sub create_process {
if ($^O eq "MSWin32"){ if ($^O eq "MSWin32"){
lock($win32_spawn_lock);
#printf STDERR "stdin %d, stdout %d, stderr %d\n", #printf STDERR "stdin %d, stdout %d, stderr %d\n",
# fileno STDIN, fileno STDOUT, fileno STDERR; # fileno STDIN, fileno STDOUT, fileno STDERR;
......
...@@ -259,22 +259,37 @@ int main(int argc, const char** argv ) ...@@ -259,22 +259,37 @@ int main(int argc, const char** argv )
the JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE flag, making sure it will be the JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE flag, making sure it will be
terminated when the last handle to it is closed(which is owned by terminated when the last handle to it is closed(which is owned by
this process). this process).
If breakaway from job fails on some reason, fallback is to create a
new process group. Process groups also allow to kill process and its
descedants, subject to some restrictions (processes have to run within
the same console,and must not ignore CTRL_BREAK)
*/ */
if (CreateProcess(NULL, (LPSTR)child_args, DWORD create_flags[]= {CREATE_BREAKAWAY_FROM_JOB, CREATE_NEW_PROCESS_GROUP, 0};
BOOL process_created= FALSE;
BOOL jobobject_assigned= FALSE;
for (int i=0; i < sizeof(create_flags)/sizeof(create_flags[0]); i++)
{
process_created= CreateProcess(NULL, (LPSTR)child_args,
NULL, NULL,
NULL, NULL,
TRUE, /* inherit handles */ TRUE, /* inherit handles */
CREATE_SUSPENDED | CREATE_BREAKAWAY_FROM_JOB, CREATE_SUSPENDED | create_flags[i],
NULL, NULL,
NULL, NULL,
&si, &si,
&process_info) == 0) &process_info);
die("CreateProcess failed"); if (process_created)
{
jobobject_assigned= AssignProcessToJobObject(job_handle, process_info.hProcess);
break;
}
}
if (AssignProcessToJobObject(job_handle, process_info.hProcess) == 0) if (!process_created)
{ {
TerminateProcess(process_info.hProcess, 200); die("CreateProcess failed");
die("AssignProcessToJobObject failed");
} }
ResumeThread(process_info.hThread); ResumeThread(process_info.hThread);
CloseHandle(process_info.hThread); CloseHandle(process_info.hThread);
...@@ -312,6 +327,13 @@ int main(int argc, const char** argv ) ...@@ -312,6 +327,13 @@ int main(int argc, const char** argv )
message("TerminateJobObject failed"); message("TerminateJobObject failed");
CloseHandle(job_handle); CloseHandle(job_handle);
message("Job terminated and closed"); message("Job terminated and closed");
if (!jobobject_assigned)
{
GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, process_info.dwProcessId);
TerminateProcess(process_info.hProcess, 202);
}
if (wait_res != WAIT_OBJECT_0 + CHILD) if (wait_res != WAIT_OBJECT_0 + CHILD)
{ {
/* The child has not yet returned, wait for it */ /* The child has not yet returned, wait for it */
......
...@@ -33,7 +33,7 @@ our $print_testcases; ...@@ -33,7 +33,7 @@ our $print_testcases;
our $skip_rpl; our $skip_rpl;
our $do_test; our $do_test;
our $skip_test; our $skip_test;
our $opt_skip_combination; our $skip_combinations;
our $binlog_format; our $binlog_format;
our $enable_disabled; our $enable_disabled;
our $default_storage_engine; our $default_storage_engine;
...@@ -119,11 +119,22 @@ sub collect_test_cases ($$) { ...@@ -119,11 +119,22 @@ sub collect_test_cases ($$) {
if ( $test->{name} =~ /.*\.$tname/ ) if ( $test->{name} =~ /.*\.$tname/ )
{ {
$found= 1; $found= 1;
last;
} }
} }
if ( not $found ) if ( not $found )
{ {
mtr_error("Could not find '$tname' in '$suites' suite(s)"); mtr_error("Could not find '$tname' in '$suites' suite(s)") unless $sname;
# If suite was part of name, find it there
my ($this_case) = collect_one_suite($sname, [ $tname ]);
if ($this_case)
{
push (@$cases, $this_case);
}
else
{
mtr_error("Could not find '$tname' in '$sname' suite");
}
} }
} }
} }
...@@ -375,7 +386,7 @@ sub collect_one_suite($) ...@@ -375,7 +386,7 @@ sub collect_one_suite($)
# Read combinations for this suite and build testcases x combinations # Read combinations for this suite and build testcases x combinations
# if any combinations exists # if any combinations exists
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
if ( ! $opt_skip_combination ) if ( ! $skip_combinations )
{ {
my @combinations; my @combinations;
my $combination_file= "$suitedir/combinations"; my $combination_file= "$suitedir/combinations";
......
...@@ -21,7 +21,25 @@ ...@@ -21,7 +21,25 @@
use strict; use strict;
use Socket; use Socket;
use Errno; use Errno;
use My::Platform;
use if IS_WINDOWS, "Net::Ping";
# Ancient perl might not have port_number method for Net::Ping.
# Check it and use fallback to connect() if it is not present.
BEGIN
{
my $use_netping= 0;
if (IS_WINDOWS)
{
my $ping = Net::Ping->new();
if ($ping->can("port_number"))
{
$use_netping= 1;
}
}
eval 'sub USE_NETPING { $use_netping }';
}
sub sleep_until_file_created ($$$); sub sleep_until_file_created ($$$);
sub mtr_ping_port ($); sub mtr_ping_port ($);
...@@ -30,6 +48,24 @@ sub mtr_ping_port ($) { ...@@ -30,6 +48,24 @@ sub mtr_ping_port ($) {
mtr_verbose("mtr_ping_port: $port"); mtr_verbose("mtr_ping_port: $port");
if (IS_WINDOWS && USE_NETPING)
{
# Under Windows, connect to a port that is not open is slow
# It takes ~1sec. Net::Ping with small timeout is much faster.
my $ping = Net::Ping->new();
$ping->port_number($port);
if ($ping->ping("localhost",0.1))
{
mtr_verbose("USED");
return 1;
}
else
{
mtr_verbose("FREE");
return 0;
}
}
my $remote= "localhost"; my $remote= "localhost";
my $iaddr= inet_aton($remote); my $iaddr= inet_aton($remote);
if ( ! $iaddr ) if ( ! $iaddr )
......
...@@ -30,6 +30,8 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line ...@@ -30,6 +30,8 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line
mtr_report_test); mtr_report_test);
use mtr_match; use mtr_match;
use My::Platform;
use POSIX qw[ _exit ];
require "mtr_io.pl"; require "mtr_io.pl";
my $tot_real_time= 0; my $tot_real_time= 0;
...@@ -257,6 +259,17 @@ sub mtr_report_stats ($) { ...@@ -257,6 +259,17 @@ sub mtr_report_stats ($) {
$tot_restarts++; $tot_restarts++;
} }
# Add counts for repeated runs, if any.
# Note that the last run has already been counted above.
my $num_repeat = $tinfo->{'repeat'} - 1;
if ( $num_repeat > 0 )
{
$tot_tests += $num_repeat;
my $rep_failed = $tinfo->{'rep_failures'} || 0;
$tot_failed += $rep_failed;
$tot_passed += $num_repeat - $rep_failed;
}
# Look for warnings produced by mysqltest # Look for warnings produced by mysqltest
my $base_file= mtr_match_extension($tinfo->{'result_file'}, my $base_file= mtr_match_extension($tinfo->{'result_file'},
"result"); # Trim extension "result"); # Trim extension
...@@ -336,7 +349,7 @@ sub mtr_report_stats ($) { ...@@ -336,7 +349,7 @@ sub mtr_report_stats ($) {
foreach my $tinfo (@$tests) foreach my $tinfo (@$tests)
{ {
my $tname= $tinfo->{'name'}; my $tname= $tinfo->{'name'};
if ( $tinfo->{failures} and ! $seen{$tname}) if ( ($tinfo->{failures} || $tinfo->{rep_failures}) and ! $seen{$tname})
{ {
print " $tname"; print " $tname";
$seen{$tname}= 1; $seen{$tname}= 1;
...@@ -459,7 +472,14 @@ sub mtr_warning (@) { ...@@ -459,7 +472,14 @@ sub mtr_warning (@) {
sub mtr_error (@) { sub mtr_error (@) {
print STDERR _name(), _timestamp(), print STDERR _name(), _timestamp(),
"mysql-test-run: *** ERROR: ", join(" ", @_), "\n"; "mysql-test-run: *** ERROR: ", join(" ", @_), "\n";
exit(1); if (IS_WINDOWS)
{
POSIX::_exit(1);
}
else
{
exit(1);
}
} }
......
...@@ -28,32 +28,36 @@ sub msg { ...@@ -28,32 +28,36 @@ sub msg {
# print "### unique($$) - ", join(" ", @_), "\n"; # print "### unique($$) - ", join(" ", @_), "\n";
} }
my $file; my $dir;
if(!IS_WINDOWS) if(!IS_WINDOWS)
{ {
$file= "/tmp/mysql-test-ports"; $dir= "/tmp/mysql-unique-ids";
} }
else else
{ {
$file= $ENV{'TEMP'}."/mysql-test-ports"; # Try to use machine-wide directory location for unique IDs,
# $ALLUSERSPROFILE . IF it is not available, fallback to $TEMP
# which is typically a per-user temporary directory
if (exists $ENV{'ALLUSERSPROFILE'} && -w $ENV{'ALLUSERSPROFILE'})
{
$dir= $ENV{'ALLUSERSPROFILE'}."/mysql-unique-ids";
}
else
{
$dir= $ENV{'TEMP'}."/mysql-unique-ids";
}
} }
my %mtr_unique_ids; my $mtr_unique_fh = undef;
END { END
my $allocated_id= $mtr_unique_ids{$$}; {
if (defined $allocated_id) mtr_release_unique_id();
{
mtr_release_unique_id($allocated_id);
}
delete $mtr_unique_ids{$$};
} }
# #
# Get a unique, numerical ID, given a file name (where all # Get a unique, numerical ID in a specified range.
# requested IDs are stored), a minimum and a maximum value.
# #
# If no unique ID within the specified parameters can be # If no unique ID within the specified parameters can be
# obtained, return undef. # obtained, return undef.
...@@ -61,135 +65,63 @@ END { ...@@ -61,135 +65,63 @@ END {
sub mtr_get_unique_id($$) { sub mtr_get_unique_id($$) {
my ($min, $max)= @_;; my ($min, $max)= @_;;
msg("get, '$file', $min-$max"); msg("get $min-$max, $$");
die "Can only get one unique id per process!" if $mtr_unique_ids{$$};
my $ret = undef; die "Can only get one unique id per process!" if defined $mtr_unique_fh;
my $changed = 0;
if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
die 'lock file is a symbolic link';
}
chmod 0777, "$file.sem";
open SEM, ">", "$file.sem" or die "can't write to $file.sem";
flock SEM, LOCK_EX or die "can't lock $file.sem";
if(! -e $file) {
open FILE, ">", $file or die "can't create $file";
close FILE;
}
msg("HAVE THE LOCK"); # Make sure our ID directory exists
if (! -d $dir)
{
# If there is a file with the reserved
# directory name, just delete the file.
if (-e $dir)
{
unlink($dir);
}
if(eval("readlink '$file'") || eval("readlink '$file.sem'")) { mkdir $dir;
die 'lock file is a symbolic link'; chmod 0777, $dir;
}
chmod 0777, $file; if(! -d $dir)
open FILE, "+<", $file or die "can't open $file"; {
#select undef,undef,undef,0.2; die "can't make directory $dir";
seek FILE, 0, 0;
my %taken = ();
while(<FILE>) {
chomp;
my ($id, $pid) = split / /;
$taken{$id} = $pid;
msg("taken: $id, $pid");
# Check if process with given pid is alive
if(!process_alive($pid)) {
print "Removing slot $id used by missing process $pid\n";
msg("Removing slot $id used by missing process $pid");
delete $taken{$id};
$changed++;
} }
} }
for(my $i=$min; $i<=$max; ++$i) {
if(! exists $taken{$i}) {
$ret = $i; my $fh;
$taken{$i} = $$; for(my $id = $min; $id <= $max; $id++)
$changed++; {
# Remember the id this process got open( $fh, ">$dir/$id");
$mtr_unique_ids{$$}= $i; chmod 0666, "$dir/$id";
msg(" got $i"); # Try to lock the file exclusively. If lock succeeds, we're done.
last; if (flock($fh, LOCK_EX|LOCK_NB))
{
# Store file handle - we would need it to release the ID (==unlock the file)
$mtr_unique_fh = $fh;
return $id;
} }
} else
if($changed) { {
seek FILE, 0, 0; close $fh;
truncate FILE, 0 or die "can't truncate $file";
for my $k (keys %taken) {
print FILE $k . ' ' . $taken{$k} . "\n";
} }
} }
close FILE; return undef;
msg("RELEASING THE LOCK");
flock SEM, LOCK_UN or warn "can't unlock $file.sem";
close SEM;
return $ret;
} }
# #
# Release a unique ID. # Release a unique ID.
# #
sub mtr_release_unique_id($) { sub mtr_release_unique_id()
my ($myid)= @_; {
msg("release $$");
msg("release, $myid"); if (defined $mtr_unique_fh)
if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
die 'lock file is a symbolic link';
}
open SEM, ">", "$file.sem" or die "can't write to $file.sem";
flock SEM, LOCK_EX or die "can't lock $file.sem";
msg("HAVE THE LOCK");
if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
die 'lock file is a symbolic link';
}
if(! -e $file) {
open FILE, ">", $file or die "can't create $file";
close FILE;
}
open FILE, "+<", $file or die "can't open $file";
#select undef,undef,undef,0.2;
seek FILE, 0, 0;
my %taken = ();
while(<FILE>) {
chomp;
my ($id, $pid) = split / /;
msg(" taken, $id $pid");
$taken{$id} = $pid;
}
if ($taken{$myid} != $$)
{ {
msg(" The unique id for this process does not match pid"); close $mtr_unique_fh;
$mtr_unique_fh = undef;
} }
msg(" removing $myid");
delete $taken{$myid};
seek FILE, 0, 0;
truncate FILE, 0 or die "can't truncate $file";
for my $k (keys %taken) {
print FILE $k . ' ' . $taken{$k} . "\n";
}
close FILE;
msg("RELEASE THE LOCK");
flock SEM, LOCK_UN or warn "can't unlock $file.sem";
close SEM;
delete $mtr_unique_ids{$$};
} }
......
This diff is collapsed.
...@@ -4,6 +4,7 @@ SELECT * INTO @Y FROM init_file.startup limit 1,1; ...@@ -4,6 +4,7 @@ SELECT * INTO @Y FROM init_file.startup limit 1,1;
SELECT YEAR(@X)-YEAR(@Y); SELECT YEAR(@X)-YEAR(@Y);
YEAR(@X)-YEAR(@Y) YEAR(@X)-YEAR(@Y)
0 0
DROP DATABASE init_file;
ok ok
end of 4.1 tests end of 4.1 tests
select * from t1; select * from t1;
...@@ -19,3 +20,5 @@ y ...@@ -19,3 +20,5 @@ y
3 3
11 11
13 13
drop table t1, t2;
call mtr.force_restart();
...@@ -96,10 +96,11 @@ CREATE FUNCTION function_for_routines() RETURNS INT RETURN 0; ...@@ -96,10 +96,11 @@ CREATE FUNCTION function_for_routines() RETURNS INT RETURN 0;
SELECT specific_name,routine_catalog,routine_schema,routine_name,routine_type, SELECT specific_name,routine_catalog,routine_schema,routine_name,routine_type,
routine_body,external_name,external_language,parameter_style,sql_path routine_body,external_name,external_language,parameter_style,sql_path
FROM information_schema.routines FROM information_schema.routines
WHERE routine_catalog IS NOT NULL OR external_name IS NOT NULL WHERE routine_schema = 'test' AND
(routine_catalog IS NOT NULL OR external_name IS NOT NULL
OR external_language IS NOT NULL OR sql_path IS NOT NULL OR external_language IS NOT NULL OR sql_path IS NOT NULL
OR routine_body <> 'SQL' OR parameter_style <> 'SQL' OR routine_body <> 'SQL' OR parameter_style <> 'SQL'
OR specific_name <> routine_name; OR specific_name <> routine_name);
DROP PROCEDURE sp_for_routines; DROP PROCEDURE sp_for_routines;
DROP FUNCTION function_for_routines; DROP FUNCTION function_for_routines;
......
...@@ -111,10 +111,11 @@ CREATE FUNCTION function_for_routines() RETURNS INT RETURN 0; ...@@ -111,10 +111,11 @@ CREATE FUNCTION function_for_routines() RETURNS INT RETURN 0;
SELECT specific_name,routine_catalog,routine_schema,routine_name,routine_type, SELECT specific_name,routine_catalog,routine_schema,routine_name,routine_type,
routine_body,external_name,external_language,parameter_style,sql_path routine_body,external_name,external_language,parameter_style,sql_path
FROM information_schema.routines FROM information_schema.routines
WHERE routine_catalog IS NOT NULL OR external_name IS NOT NULL WHERE routine_schema = 'test' AND
(routine_catalog IS NOT NULL OR external_name IS NOT NULL
OR external_language IS NOT NULL OR sql_path IS NOT NULL OR external_language IS NOT NULL OR sql_path IS NOT NULL
OR routine_body <> 'SQL' OR parameter_style <> 'SQL' OR routine_body <> 'SQL' OR parameter_style <> 'SQL'
OR specific_name <> routine_name; OR specific_name <> routine_name);
specific_name routine_catalog routine_schema routine_name routine_type routine_body external_name external_language parameter_style sql_path specific_name routine_catalog routine_schema routine_name routine_type routine_body external_name external_language parameter_style sql_path
DROP PROCEDURE sp_for_routines; DROP PROCEDURE sp_for_routines;
DROP FUNCTION function_for_routines; DROP FUNCTION function_for_routines;
......
...@@ -14,7 +14,7 @@ SELECT * INTO @X FROM init_file.startup limit 0,1; ...@@ -14,7 +14,7 @@ SELECT * INTO @X FROM init_file.startup limit 0,1;
SELECT * INTO @Y FROM init_file.startup limit 1,1; SELECT * INTO @Y FROM init_file.startup limit 1,1;
SELECT YEAR(@X)-YEAR(@Y); SELECT YEAR(@X)-YEAR(@Y);
# Enable this DROP DATABASE only after resolving bug #42507 # Enable this DROP DATABASE only after resolving bug #42507
# DROP DATABASE init_file; DROP DATABASE init_file;
--echo ok --echo ok
--echo end of 4.1 tests --echo end of 4.1 tests
...@@ -28,4 +28,9 @@ select * from t1; ...@@ -28,4 +28,9 @@ select * from t1;
# 30, 3, 11, 13 # 30, 3, 11, 13
select * from t2; select * from t2;
# Enable this DROP TABLE only after resolving bug #42507 # Enable this DROP TABLE only after resolving bug #42507
#drop table t1, t2; drop table t1, t2;
# MTR will restart server anyway, but by forcing it we avoid being warned
# about the apparent side effect
call mtr.force_restart();
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