summaryrefslogtreecommitdiff
path: root/storage/maria/ma_recovery.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-06-13 12:46:11 +0300
committerMichael Widenius <monty@askmonty.org>2011-06-13 12:46:11 +0300
commitbf0e1f44c6b3306e84bbfd783c898a1764836242 (patch)
tree4dcf93558b18c7fdf52ee2b4a445a78973f01513 /storage/maria/ma_recovery.h
parent2f6c43c5a02482ba92f2d463a6f5bf6383f0ec51 (diff)
downloadmariadb-git-bf0e1f44c6b3306e84bbfd783c898a1764836242.tar.gz
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.
Diffstat (limited to 'storage/maria/ma_recovery.h')
-rw-r--r--storage/maria/ma_recovery.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/maria/ma_recovery.h b/storage/maria/ma_recovery.h
index 5b22c4fd9b2..45dba0e86b3 100644
--- a/storage/maria/ma_recovery.h
+++ b/storage/maria/ma_recovery.h
@@ -32,4 +32,5 @@ int maria_apply_log(LSN lsn, LSN lsn_end, enum maria_apply_log_way apply,
my_bool take_checkpoints, uint *warnings_count);
/* Table of tables to recover */
extern HASH tables_to_redo;
+extern ulong maria_recovery_force_crash_counter;
C_MODE_END