diff options
| author | unknown <monty@donna.mysql.com> | 2000-10-11 01:18:03 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-10-11 01:18:03 +0300 |
| commit | da2c52f1fe73f1fca8d95875957b4bcb4bd84a4b (patch) | |
| tree | b2c67cc4d23c305090ee2d98ec39d9ec6b034a3c /sql/handler.h | |
| parent | e07d0930f4ecadf576c1dca76df3caab83ba04ae (diff) | |
| parent | 3b5f8e5ee4ca4f78c2701d819f41820391de8b1a (diff) | |
| download | mariadb-git-da2c52f1fe73f1fca8d95875957b4bcb4bd84a4b.tar.gz | |
merge
mysys/charset.c:
Auto merged
BitKeeper/etc/logging_ok:
Auto merged
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/handler.h b/sql/handler.h index d256ee944e7..1457c033ed9 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -66,7 +66,6 @@ #define HA_NO_WRITE_DELAYED (HA_NOT_EXACT_COUNT*2) #define HA_PRIMARY_KEY_IN_READ_INDEX (HA_NO_WRITE_DELAYED*2) #define HA_DROP_BEFORE_CREATE (HA_PRIMARY_KEY_IN_READ_INDEX*2) -#define HA_CHECK_AND_REPAIR (HA_DROP_BEFORE_CREATE*2) /* Parameters for open() (in register form->filestat) */ /* HA_GET_INFO does a implicit HA_ABORT_IF_LOCKED */ @@ -146,9 +145,10 @@ typedef struct st_ha_check_opt bool quick; bool changed_files; bool optimize; + bool retry_without_quick; inline void init() { - flags= 0; quick= optimize=0; + flags= 0; quick= optimize= retry_without_quick=0; sort_buffer_size = myisam_sort_buffer_size; } } HA_CHECK_OPT; @@ -249,7 +249,7 @@ public: virtual void update_create_info(HA_CREATE_INFO *create_info) {} virtual int check(THD* thd, HA_CHECK_OPT* check_opt ); virtual int repair(THD* thd, HA_CHECK_OPT* check_opt); - virtual bool check_and_repair(THD *thd, const char *name) {return 1;} + virtual bool check_and_repair(THD *thd) {return 1;} virtual int optimize(THD* thd,HA_CHECK_OPT* check_opt); virtual int analyze(THD* thd, HA_CHECK_OPT* check_opt); virtual int backup(THD* thd, HA_CHECK_OPT* check_opt); @@ -274,6 +274,8 @@ public: virtual uint max_key_length()const =0; virtual uint min_record_length(uint options) const { return 1; } virtual bool low_byte_first() const { return 1; } + virtual bool is_crashed() const { return 0; } + virtual bool auto_repair() const { return 0; } virtual int rename_table(const char *from, const char *to); virtual int delete_table(const char *name); |