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

merge 48250, 48918, 49096

Browse Source
This commit is contained in:
Bjorn Munch
2009-11-26 12:08:18 +01:00
parent 055728420f 8e19b78124
commit 014e73cfd3
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1080,6 +1080,11 @@ sub command_line_setup {
}
}
if (IS_WINDOWS and defined $opt_mem) {
mtr_report("--mem not supported on Windows, ignored");
$opt_mem= undef;
}
# --------------------------------------------------------------------------
# Check if we should speed up tests by trying to run on tmpfs
# --------------------------------------------------------------------------
@ -3896,7 +3901,7 @@ sub check_expected_crash_and_restart {
foreach my $mysqld ( mysqlds() )
{
next unless ( $mysqld->{proc} eq $proc );
next unless ( $mysqld->{proc} and $mysqld->{proc} eq $proc );
# Check if crash expected by looking at the .expect file
# in var/tmp