diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-29 15:32:25 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-29 15:32:25 +0200 |
| commit | a19f4e3a3af4c18ec89f8f8a4ae32e3c7d7fec70 (patch) | |
| tree | 0a952801c119021e9a0e9e25873aa20bb3bc90ee /include/maria.h | |
| parent | 0c3b78438b627127f1a567aaede90466be549f52 (diff) | |
| download | mariadb-git-a19f4e3a3af4c18ec89f8f8a4ae32e3c7d7fec70.tar.gz | |
Fixed that maria-recover works as expected.
- "" is now used if no option is set
include/maria.h:
Added HA_RECOVER_ANY
storage/maria/ha_maria.cc:
Insert of checking if maria_recover_options == 0, check if any bit is set.
Fix maria_recover_names to match bitmap. This fixes that recover options works as expected.
storage/maria/ha_maria.h:
Insert of checking if maria_recover_options == 0, check if any bit is set.
storage/maria/ma_check.c:
Fixed wrong print
Diffstat (limited to 'include/maria.h')
| -rw-r--r-- | include/maria.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/maria.h b/include/maria.h index 1f054bce58d..192e5a565aa 100644 --- a/include/maria.h +++ b/include/maria.h @@ -335,6 +335,8 @@ extern int maria_begin(MARIA_HA *info); extern void maria_disable_logging(MARIA_HA *info); extern void maria_enable_logging(MARIA_HA *info); +#define HA_RECOVER_ANY (HA_RECOVER_DEFAULT | HA_RECOVER_BACKUP | HA_RECOVER_FORCE | HA_RECOVER_QUICK) + /* this is used to pass to mysql_mariachk_table */ #define MARIA_CHK_REPAIR 1 /* equivalent to mariachk -r */ |