diff options
| author | unknown <guilhem@mysqlwin32.> | 2008-02-04 22:15:29 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysqlwin32.> | 2008-02-04 22:15:29 +0100 |
| commit | 20bed839e18e68362d678e8cf16ef8c1f13937bf (patch) | |
| tree | 5e61244381361e090fb1fcc9ffe69d0fd67e2b0d | |
| parent | eff26176c81ded86cd843a0ff9609f28f550689e (diff) | |
| parent | 438acd2dd8222549c485206347e33fd234fb186d (diff) | |
| download | mariadb-git-20bed839e18e68362d678e8cf16ef8c1f13937bf.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria
into mysqlwin32.:C:/mysql-maria
storage/maria/unittest/ma_test_recovery.pl:
Auto merged
| -rw-r--r-- | mysql-test/include/wait_until_connected_again.inc | 2 | ||||
| -rw-r--r-- | mysql-test/t/maria-recovery-big.test | 1 | ||||
| -rwxr-xr-x | storage/maria/unittest/ma_test_recovery.pl | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc index 3d8a6212c34..02d544cb966 100644 --- a/mysql-test/include/wait_until_connected_again.inc +++ b/mysql-test/include/wait_until_connected_again.inc @@ -8,7 +8,7 @@ let $counter= 5000; let $mysql_errno= 1; while ($mysql_errno) { - --error 0,2002,2003,2006 + --error 0,2002,2003,2006,1053 show status; dec $counter; diff --git a/mysql-test/t/maria-recovery-big.test b/mysql-test/t/maria-recovery-big.test index d71865b73c1..591109b7eae 100644 --- a/mysql-test/t/maria-recovery-big.test +++ b/mysql-test/t/maria-recovery-big.test @@ -7,6 +7,7 @@ # Binary must be compiled with debug for crash to occur --source include/have_debug.inc --source include/have_maria.inc +--source include/big_test.inc set global maria_log_file_size=4294967295; diff --git a/storage/maria/unittest/ma_test_recovery.pl b/storage/maria/unittest/ma_test_recovery.pl index 531fb146713..214e8d1d854 100755 --- a/storage/maria/unittest/ma_test_recovery.pl +++ b/storage/maria/unittest/ma_test_recovery.pl @@ -90,8 +90,10 @@ foreach my $prog (@t) `mv $table.MAD $tmp/$table-good.MAD`; `mv $table.MAI $tmp/$table-good.MAI`; apply_log($table, "shouldnotchangelog"); - `cmp $table.MAD $tmp/$table-good.MAD`; - `cmp $table.MAI $tmp/$table-good.MAI`; + $res= `cmp $table.MAD $tmp/$table-good.MAD`; + print MY_LOG $res; + $res= `cmp $table.MAI $tmp/$table-good.MAI`; + print MY_LOG $res; check_table_is_same($table, $checksum); print MY_LOG "testing idempotency\n"; apply_log($table, "shouldnotchangelog"); |