Fixed portability problem with partiton_error.test

Added option to aria_read_log to crash recovery at certain points in the recovery process.
Fixed bug that caused future recovery attempts to fail if we got a crash/got killed during closing of tables at end of recovery process.


mysql-test/mysql-test-run.pl:
  Don't abort if 'var' points to stale place; Just remove it.
mysql-test/suite/maria/r/maria.result:
  Fixed wrong indentation
mysql-test/t/partition_error.test:
  Fixed portability problem with partiton_error.test
storage/maria/ma_close.c:
  More DBUG_PRINT info
storage/maria/ma_pagecache.c:
  Copy flush_log_callback when writing to page cache. This fixes problem in recovery when switching from mode of file
storage/maria/ma_recovery.c:
  Added option to aria_read_log to crash recovery at certain points in the recovery process.
storage/maria/ma_recovery.h:
  Added option to aria_read_log to crash recovery at certain points in the recovery process.
storage/maria/maria_chk.c:
  Align aria_chk -d output
  Don't write warning Aria table '...' is usable but should be fixed if the table was before marked as crashed but now is ok
storage/maria/maria_read_log.c:
  Added option to aria_read_log to crash recovery at certain points in the recovery process.

3 files changed, 13 insertions, 9 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 8d11abc8a37..38042d1f272 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2345,9 +2345,11 @@ sub remove_stale_vardir () {
 	mtr_report(" - WARNING: Using the 'mysql-test/var' symlink");
 
 	# Make sure the directory where it points exist
-	mtr_error("The destination for symlink $opt_vardir does not exist")
-	  if ! -d readlink($opt_vardir);
-
+        if (! -d readlink($opt_vardir))
+        {
+          mtr_report("The destination for symlink $opt_vardir does not exist; Removing it and creating a new var directory");
+          unlink($opt_vardir);
+        }
 	foreach my $bin ( glob("$opt_vardir/*") )
 	{
 	  mtr_verbose("Removing bin $bin");
@@ -2414,8 +2416,11 @@ sub setup_vardir() {
       #  it's a symlink
 
       # Make sure the directory where it points exist
-      mtr_error("The destination for symlink $opt_vardir does not exist")
-	if ! -d readlink($opt_vardir);
+      if (! -d readlink($opt_vardir))
+      {
+        mtr_report("The destination for symlink $opt_vardir does not exist; Removing it and creating a new var directory");
+        unlink($opt_vardir);
+      }
     }
     elsif ( $opt_mem )
     {
diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/r/maria.result
index f7ce8efaa46..217955310f9 100644
--- a/mysql-test/suite/maria/r/maria.result
+++ b/mysql-test/suite/maria/r/maria.result
@@ -2131,7 +2131,7 @@ c3 VARCHAR(10) NOT NULL,
 KEY (c1),
 KEY (c2)
 ) ENGINE=aria DEFAULT CHARSET=utf8 PACK_KEYS=0;
-Aria file:          MYSQLD_DATADIR/test/t1
+Aria file:           MYSQLD_DATADIR/test/t1
 Record format:       Block
 Crashsafe:           yes
 Character set:       utf8_general_ci (33)
diff --git a/mysql-test/t/partition_error.test b/mysql-test/t/partition_error.test
index 81bb7b55cec..9db3ff93634 100644
--- a/mysql-test/t/partition_error.test
+++ b/mysql-test/t/partition_error.test
@@ -695,14 +695,13 @@ CREATE TABLE t1 (a INT) PARTITION BY HASH (a);
 FLUSH TABLES;
 --remove_file $MYSQLD_DATADIR/test/t1.par
 --replace_result $MYSQLD_DATADIR ./
---replace_result \\ /
 CHECK TABLE t1;
---replace_result \\ /
+--replace_result $MYSQLD_DATADIR ./
 --error 29
 SELECT * FROM t1;
 --echo # Note that it is currently impossible to drop a partitioned table
 --echo # without the .par file
---replace_result \\ /
+--replace_result $MYSQLD_DATADIR ./
 --error 29
 DROP TABLE t1;
 --remove_file $MYSQLD_DATADIR/test/t1.frm