diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-29 22:48:24 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-29 22:48:24 +0200 |
| commit | a7f87effa57f6486c23bf5b340c8474a635dcf71 (patch) | |
| tree | 5f72d973eaaa8a62d871a25640a2618d7284537d /include/maria.h | |
| parent | 389acf0a30415c745d2c241e1584b0b637ab95ed (diff) | |
| parent | a19f4e3a3af4c18ec89f8f8a4ae32e3c7d7fec70 (diff) | |
| download | mariadb-git-a7f87effa57f6486c23bf5b340c8474a635dcf71.tar.gz | |
Merge with 5.1 + fixes for build failures in 5.2
cmd-line-utils/libedit/map.c:
Fixed compiler warning
cmd-line-utils/libedit/terminal.c:
Fixed compiler warning
cmd-line-utils/libedit/tty.c:
Fixed compiler warning
sql/sql_base.cc:
Fixed memory leak found by valgrind
storage/maria/compat_aliases.cc:
Ensure that recover_alias is also a set
storage/maria/ma_bitmap.c:
Proper fix for compiler warning
support-files/compiler_warnings.supp:
Fixed compiler warning
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 470f76669f3..328cb491bca 100644 --- a/include/maria.h +++ b/include/maria.h @@ -339,6 +339,8 @@ extern void maria_enable_logging(MARIA_HA *info); #define HA_RECOVER_FORCE 4 /* Recover even if we loose rows */ #define HA_RECOVER_QUICK 8 /* Don't check rows in data file */ +#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 */ |