diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-03 01:01:12 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-03 01:01:12 +0200 |
| commit | 1027b4cfc9ae6961c6b2e2b38858e6289fc5500d (patch) | |
| tree | 3af11f428725ec19004ab09972915b290ef42be7 /storage/maria/maria_chk.c | |
| parent | 336023b6b421b9ac4f3fda14f6f7b0e5ff7bd8e6 (diff) | |
| download | mariadb-git-1027b4cfc9ae6961c6b2e2b38858e6289fc5500d.tar.gz | |
Don't delete directory mysql-test/var if we use mysql-test-run --vardir=
Fixed error in Maria unittest
Fixes other issues found by test case for lp:700623 "Aria recovery: ma_blockrec.c:3930: _ma_update_at_original_place: Assertion `block->org_bitmap_value == .."
Fixes lp:670356 "Aria table "is marked as crashed and should be repaired"
mysql-test/lib/v1/mysql-test-run.pl:
Don't delete directory mysql-test/var if we use mysql-test-run --vardir=
mysql-test/mysql-test-run.pl:
Don't delete directory mysql-test/var if we use mysql-test-run --vardir=
(Needed to be able to run multiple concurrent mysql-test-run's/randgen on the same server)
Added extra supression
storage/maria/ma_pagecache.c:
Removed duplicate DBUG_PRINT information
Added KEYCACHE_PRINT for printing information that was already printed to DBUG log (to get rid of some duplicated output)
More comments
Fixed bug that caused page block to be used by two treads at the same time (with different page information)
Mark block->status with PCBLOCK_DIRECT_W independent of the block is changed or not. (Safety fix)
storage/maria/maria_chk.c:
Better --help
storage/maria/unittest/ma_test_recovery.pl:
Ignore differences in 'recover time'.
Fixed error in Maria unittest
Diffstat (limited to 'storage/maria/maria_chk.c')
| -rw-r--r-- | storage/maria/maria_chk.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index fd7be248a82..33b920b93fd 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -345,9 +345,11 @@ static struct my_option my_long_options[] = &opt_transaction_logging, &opt_transaction_logging, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"update-state", 'U', - "Mark tables as crashed if any errors were found and clean if check didn't " - "find any errors. This allows one to get rid of warnings like 'table not " - "properly closed'", + "Mark tables as crashed if any errors were found and clean if check " + "didn't find any errors but table was marked as 'not clean' before. This " + "allows one to get rid of warnings like 'table not properly closed'. " + "If table was updated, update also the timestamp for when check was made. " + "This option is on by default!", &opt_update_state, &opt_update_state, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"unpack", 'u', @@ -485,7 +487,13 @@ static void usage(void) -m, --medium-check Faster than extend-check, but only finds 99.99% of\n\ all errors. Should be good enough for most cases.\n\ -T, --read-only Don't mark table as checked.\n\ - -U, --update-state Mark tables as crashed if you find any errors.\n\ + -U, --update-state Mark tables as crashed if any errors were found and\n\ + clean if check didn't find any errors but table was\n\ + marked as 'not clean' before. This allows one to get\n\ + rid of warnings like 'table not properly closed'. If\n\ + table was updated, update also the timestamp for when\n\ + the check was made. This option is on by default!\n\ + use --skip-update-state to disable.\n\ --warning-for-wrong-transaction-id\n\ Give a warning if we find a transaction id in the table that is bigger\n\ than what exists in the control file. Use --skip-... to disable warning\n\ |