mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
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.
This commit is contained in:
@@ -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 )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user