diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 8 | ||||
| -rw-r--r-- | include/my_sys.h | 3 | ||||
| -rw-r--r-- | include/myisam.h | 7 | ||||
| -rw-r--r-- | include/mysqld_error.h | 3 |
4 files changed, 14 insertions, 7 deletions
diff --git a/include/my_base.h b/include/my_base.h index 5b16e79798d..dd9dafc5fbb 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -43,8 +43,9 @@ #define HA_OPEN_ABORT_IF_LOCKED 0 /* default */ #define HA_OPEN_WAIT_IF_LOCKED 1 #define HA_OPEN_IGNORE_IF_LOCKED 2 -#define HA_OPEN_TMP_TABLE 4 -#define HA_OPEN_DELAY_KEY_WRITE 8 +#define HA_OPEN_TMP_TABLE 4 /* Table is a temp table */ +#define HA_OPEN_DELAY_KEY_WRITE 8 /* Don't update index */ +#define HA_OPEN_ABORT_IF_CRASHED 16 /* The following is parameter to ha_rkey() how to use key */ @@ -163,7 +164,7 @@ enum ha_base_keytype { #define HA_OPTION_TEMP_COMPRESS_RECORD ((uint) 16384) /* set by isamchk */ #define HA_OPTION_READ_ONLY_DATA ((uint) 32768) /* Set by isamchk */ - /* Bits in flag to ni_create() */ + /* Bits in flag to create() */ #define HA_DONT_TOUCH_DATA 1 /* Don't empty datafile (isamchk) */ #define HA_PACK_RECORD 2 /* Request packed record format */ @@ -203,6 +204,7 @@ enum ha_base_keytype { #define HA_ERR_FOUND_DUPP_UNIQUE 141 /* Dupplicate unique on write */ #define HA_ERR_UNKNOWN_CHARSET 142 /* Can't open charset */ #define HA_ERR_WRONG_TABLE_DEF 143 +#define HA_ERR_CRASHED_ON_REPAIR 144 /* Last (automatic?) repair failed */ /* Other constants */ diff --git a/include/my_sys.h b/include/my_sys.h index ddea92ea185..05c63df1d77 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -62,6 +62,7 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_LINK_WARNING 32 /* my_redel() gives warning if links */ #define MY_COPYTIME 64 /* my_redel() copys time */ #define MY_HOLD_ORIGINAL_MODES 128 /* my_copy() holds to file modes */ +#define MY_REDEL_MAKE_BACKUP 256 #define MY_SEEK_NOT_DONE 32 /* my_lock may have to do a seek */ #define MY_DONT_WAIT 64 /* my_lock() don't wait if can't lock */ #define MY_ZEROFILL 32 /* my_malloc(), fill array with zero */ @@ -219,7 +220,7 @@ typedef struct st_typelib { /* Different types saved here */ const char **type_names; } TYPELIB; -enum cache_type {READ_CACHE,WRITE_CACHE,READ_NET,WRITE_NET}; +enum cache_type {READ_CACHE,WRITE_CACHE,READ_FIFO,READ_NET,WRITE_NET}; enum flush_type { FLUSH_KEEP, FLUSH_RELEASE, FLUSH_IGNORE_CHANGED, FLUSH_FORCE_WRITE}; diff --git a/include/myisam.h b/include/myisam.h index 33d2e258b03..885ded085ca 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -273,9 +273,11 @@ extern uint mi_get_pointer_length(ulonglong file_length, uint def); #define T_CREATE_MISSING_KEYS T_TRUST_HEADER*2 #define T_SAFE_REPAIR T_CREATE_MISSING_KEYS*2 #define T_AUTO_REPAIR T_SAFE_REPAIR*2 +#define T_BACKUP_DATA T_AUTO_REPAIR*2 #define O_NEW_INDEX 1 /* Bits set in out_flag */ #define O_NEW_DATA 2 +#define O_DATA_LOST 4 /* these struct is used by my_check to tell it what to do */ @@ -359,7 +361,8 @@ int mi_sort_index(MI_CHECK *param, register MI_INFO *info, my_string name); int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, const char * name, int rep_quick); int change_to_newfile(const char * filename, const char * old_ext, - const char * new_ext, uint raid_chunks); + const char * new_ext, uint raid_chunks, + myf myflags); int lock_file(MI_CHECK *param, File file, my_off_t start, int lock_type, const char *filetype, const char *filename); void lock_memory(MI_CHECK *param); @@ -378,7 +381,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, int test_if_almost_full(MI_INFO *info); int recreate_table(MI_CHECK *param, MI_INFO **org_info, char *filename); void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows); -my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows); +my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows, my_bool force); #ifdef __cplusplus } diff --git a/include/mysqld_error.h b/include/mysqld_error.h index d815e61f3b5..718b734ef6d 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -193,4 +193,5 @@ #define ER_MASTER_NET_WRITE 1190 #define ER_FT_MATCHING_KEY_NOT_FOUND 1191 #define ER_LOCK_OR_ACTIVE_TRANSACTION 1192 -#define ER_ERROR_MESSAGES 193 +#define ER_UNKNOWN_SYSTEM_VARIABLE 1193 +#define ER_ERROR_MESSAGES 194 |