summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authormonty@tik.mysql.com <>2000-10-11 00:06:37 +0300
committermonty@tik.mysql.com <>2000-10-11 00:06:37 +0300
commit09dce662e273113029cc404af07d82b9c9c56fb6 (patch)
treecf18eb0d045153270d68aec8884a4732e953e883 /sql/handler.h
parent16f11f94b2fa7c7fca19fb5160b27c902c446a3c (diff)
downloadmariadb-git-09dce662e273113029cc404af07d82b9c9c56fb6.tar.gz
Automatic repair of MyISAM tables + portability fixes
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h8
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);