summaryrefslogtreecommitdiff
path: root/storage/maria/ma_check.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-01-06 22:49:17 +0200
committerMichael Widenius <monty@askmonty.org>2011-01-06 22:49:17 +0200
commit5b0afd8a0d57df6528e59b243e95881808bfb958 (patch)
tree51913342c30f4a4fd627cbd0ebb35c1827db70c7 /storage/maria/ma_check.c
parent6b03fbf9fcacc74cb2999ba7715d22d754f356c7 (diff)
downloadmariadb-git-5b0afd8a0d57df6528e59b243e95881808bfb958.tar.gz
Bug fixing in Aria:
- Fixed some bugs in recovery of blobs - Don't ASSERT() on checksum errors when running check table - Added to maria_read_log option --tables-to-redo=list-of-tables to only recover some tables (good for debugging) storage/maria/ma_blockrec.c: Don't ASSERT() on checksum errors when running check table Fixed bug in recovery of blog page that was not in dirty pages list storage/maria/ma_check.c: Don't ASSERT() on checksum errors when running check table storage/maria/ma_recovery.c: Handling of --tables-to-redo storage/maria/ma_recovery.h: Handling of --tables-to-redo storage/maria/ma_recovery_util.c: Give better warning if table was not in dirty pages list storage/maria/maria_def.h: Added in_check_table storage/maria/maria_read_log.c: Added --tables-to-redo=list-of-tables to only recover some tables (good for debugging) Cleaned up message when wrong arguments
Diffstat (limited to 'storage/maria/ma_check.c')
-rw-r--r--storage/maria/ma_check.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
index 631fa879504..4619dac0d91 100644
--- a/storage/maria/ma_check.c
+++ b/storage/maria/ma_check.c
@@ -2039,6 +2039,8 @@ int maria_chk_data_link(HA_CHECK *param, MARIA_HA *info, my_bool extend)
bzero((char*) param->tmp_key_crc,
share->base.keys * sizeof(param->tmp_key_crc[0]));
+ info->in_check_table= 1; /* Don't assert on checksum errors */
+
switch (share->data_file_type) {
case BLOCK_RECORD:
error= check_block_record(param, info, extend, record);
@@ -2054,6 +2056,8 @@ int maria_chk_data_link(HA_CHECK *param, MARIA_HA *info, my_bool extend)
break;
} /* switch */
+ info->in_check_table= 0;
+
if (error)
goto err;