diff options
| author | unknown <serg@serg.mysql.com> | 2002-06-30 16:14:48 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-06-30 16:14:48 +0000 |
| commit | fa87affa0c66ba07cebe44363a9ea8eec0d8b26e (patch) | |
| tree | 982282b567e1de58ac0c3525ec4d78ad82500a7a /include | |
| parent | 422d3873af935a3720ba869a866e17136dc2e99c (diff) | |
| parent | 4d10683775edd2ad63e78acc09fc7d40b83efba9 (diff) | |
| download | mariadb-git-fa87affa0c66ba07cebe44363a9ea8eec0d8b26e.tar.gz | |
merged
include/myisam.h:
Auto merged
myisam/myisamchk.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/myisam.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 70de1e43a18..0b191c17173 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -666,8 +666,6 @@ extern int _my_b_read_r(IO_CACHE *info,byte *Buffer,uint Count); extern void init_io_cache_share(IO_CACHE *info, IO_CACHE_SHARE *s, uint num_threads); extern void remove_io_thread(IO_CACHE *info); -int lock_io_cache(IO_CACHE *); -void unlock_io_cache(IO_CACHE *); #endif extern int _my_b_seq_read(IO_CACHE *info,byte *Buffer,uint Count); extern int _my_b_net_read(IO_CACHE *info,byte *Buffer,uint Count); diff --git a/include/myisam.h b/include/myisam.h index 9b5d21a1844..a30155841ff 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -384,7 +384,7 @@ typedef struct st_mi_sort_param IO_CACHE tempfile, tempfile_for_exceptions; DYNAMIC_ARRAY buffpek; my_off_t pos,max_pos,filepos,start_recpos; - my_bool fix_datafile; + my_bool fix_datafile, master; char *record; char *tmpdir; int (*key_cmp)(struct st_mi_sort_param *, const void *, const void *); @@ -406,6 +406,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, 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 mi_repair_parallel(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, myf myflags); |