Commit 0543c5f0 authored by unknown's avatar unknown

Minor test fixes


mysql-test/include/wait_until_connected_again.inc:
  On Windows, mysqladmin does not wait on pid file when it has shut down
  mysqld. Thus, in maria_empty_logs.inc, wait_until_connected_again.inc
  can run while mysqld is shutting down (has not finished) and so
  get "shutdown in progress" instead of "can't connect".
mysql-test/t/maria-recovery-big.test:
  it is a big test
storage/maria/unittest/ma_test_recovery.pl:
  We want to see the result of 'cmp', like in the shell version
parent 4a1763e4
...@@ -8,7 +8,7 @@ let $counter= 5000; ...@@ -8,7 +8,7 @@ let $counter= 5000;
let $mysql_errno= 1; let $mysql_errno= 1;
while ($mysql_errno) while ($mysql_errno)
{ {
--error 0,2002,2003,2006 --error 0,2002,2003,2006,1053
show status; show status;
dec $counter; dec $counter;
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
# Binary must be compiled with debug for crash to occur # Binary must be compiled with debug for crash to occur
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_maria.inc --source include/have_maria.inc
--source include/big_test.inc
set global maria_log_file_size=4294967295; set global maria_log_file_size=4294967295;
......
...@@ -90,8 +90,10 @@ foreach my $prog (@t) ...@@ -90,8 +90,10 @@ foreach my $prog (@t)
`mv $table.MAD $tmp/$table-good.MAD`; `mv $table.MAD $tmp/$table-good.MAD`;
`mv $table.MAI $tmp/$table-good.MAI`; `mv $table.MAI $tmp/$table-good.MAI`;
apply_log($table, "shouldnotchangelog"); apply_log($table, "shouldnotchangelog");
`cmp $table.MAD $tmp/$table-good.MAD`; $res= `cmp $table.MAD $tmp/$table-good.MAD`;
`cmp $table.MAI $tmp/$table-good.MAI`; print MY_LOG $res;
$res= `cmp $table.MAI $tmp/$table-good.MAI`;
print MY_LOG $res;
check_table_is_same($table, $checksum); check_table_is_same($table, $checksum);
print MY_LOG "testing idempotency\n"; print MY_LOG "testing idempotency\n";
apply_log($table, "shouldnotchangelog"); apply_log($table, "shouldnotchangelog");
......
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