diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-16 20:07:34 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-16 20:07:34 -0500 |
| commit | 89b2bc42f405e20af11423b0cf83032fcb2a3de4 (patch) | |
| tree | 21210fbd477a843af40f1a13249f463708ca2d27 /include | |
| parent | 920bc0aff10b87a8524939c31029653afb94470c (diff) | |
| parent | 357cb12d87aa9d6abcf345b7221cf58d01203cdf (diff) | |
| download | mariadb-git-89b2bc42f405e20af11423b0cf83032fcb2a3de4.tar.gz | |
Merge revisions from maria/5.5
bzr merge -r4388 lp:maria/5.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_check_opt.h | 4 | ||||
| -rw-r--r-- | include/my_sys.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/my_check_opt.h b/include/my_check_opt.h index abd4f4a96a7..f952792d2c8 100644 --- a/include/my_check_opt.h +++ b/include/my_check_opt.h @@ -63,7 +63,9 @@ extern "C" { #define T_ZEROFILL (1ULL << 32) #define T_ZEROFILL_KEEP_LSN (1ULL << 33) /** If repair should not bump create_rename_lsn */ -#define T_NO_CREATE_RENAME_LSN (1ULL << 33) +#define T_NO_CREATE_RENAME_LSN (1ULL << 34) +/** If repair shouldn't do any locks */ +#define T_NO_LOCKS (1ULL << 35) #define T_REP_ANY (T_REP | T_REP_BY_SORT | T_REP_PARALLEL) diff --git a/include/my_sys.h b/include/my_sys.h index da0462825eb..7e37fe598bd 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -672,6 +672,7 @@ extern my_bool has_path(const char *name); extern char *convert_dirname(char *to, const char *from, const char *from_end); extern void to_unix_path(char * name); extern char * fn_ext(const char *name); +extern char * fn_ext2(const char *name); extern char * fn_same(char * toname,const char *name,int flag); extern char * fn_format(char * to,const char *name,const char *dir, const char *form, uint flag); |