Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria

into  mysqlwin32.:C:/mysql-maria


storage/maria/unittest/ma_test_recovery.pl:
  Auto merged

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;

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;
 

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");