diff options
author | unknown <monty@hundin.mysql.fi> | 2001-05-31 14:07:17 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-05-31 14:07:17 +0300 |
commit | a178584d8a8a81e461c1107f8558ee6233258ce5 (patch) | |
tree | f19c68fd5b7d68ad4f7919cb8e6eae7d6961956e /myisam/myisamlog.c | |
parent | bc50c5787e98e5d6c0d84013254a388f2ebf7f9b (diff) | |
download | mariadb-git-a178584d8a8a81e461c1107f8558ee6233258ce5.tar.gz |
Removed compiler warnings.
Added preliminary handling of symlinks in MyISAM.
When using myisamchk to check tables with --force, don't repair
tables that are marked as 'not closed' if they are ok.
Change fn_format() to use my_real_path and my_symlink
include/myisam.h:
Added handling of symlinks
myisam/ft_boolean_search.c:
cleanup
myisam/ft_dump.c:
cleanup
myisam/mi_check.c:
Added handling of symlinks.
When using check and --force, don't repair tables that are marked
as 'not closed' if they are ok.
myisam/mi_create.c:
Added handling of symlinks.
myisam/mi_dbug.c:
Added handling of symlinks.
myisam/mi_info.c:
Added handling of symlinks.
myisam/mi_open.c:
Added handling of symlinks.
myisam/mi_search.c:
cleanup
myisam/myisamchk.c:
Added handling of symlinks.
myisam/myisamdef.h:
Added handling of symlinks.
myisam/myisamlog.c:
Fixed bug when using new trees
myisam/myisampack.c:
cleanup
mysys/mf_cache.c:
cleanup
mysys/mf_format.c:
Change to use my_real_path and my_symlink
mysys/my_alloc.c:
cleanup
BitKeeper/etc/ignore:
Added libmysqld/sql_command libmysqld/backup_dir libmysqld/simple-test to the ignore list
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'myisam/myisamlog.c')
-rw-r--r-- | myisam/myisamlog.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/myisam/myisamlog.c b/myisam/myisamlog.c index ca2c4f27a74..4b227bb9699 100644 --- a/myisam/myisamlog.c +++ b/myisam/myisamlog.c @@ -56,7 +56,7 @@ extern int main(int argc,char * *argv); static void get_options(int *argc,char ***argv); static int examine_log(my_string file_name,char **table_names); static int read_string(IO_CACHE *file,gptr *to,uint length); -static int file_info_compare(void *a,void *b); +static int file_info_compare(void *cmp_arg, void *a,void *b); static int test_if_open(struct file_info *key,element_count count, struct test_if_open_param *param); static void fix_blob_pointers(MI_INFO *isam,byte *record); @@ -331,7 +331,7 @@ static int examine_log(my_string file_name, char **table_names) init_io_cache(&cache,file,0,READ_CACHE,start_offset,0,MYF(0)); bzero((gptr) com_count,sizeof(com_count)); - init_tree(&tree,0,sizeof(file_info),(qsort_cmp) file_info_compare,1, + init_tree(&tree,0,sizeof(file_info),(qsort_cmp2) file_info_compare,1, (void(*)(void*)) file_info_free); VOID(init_key_cache(KEY_CACHE_SIZE,(uint) (10*4*(IO_SIZE+MALLOC_OVERHEAD)))); @@ -698,7 +698,8 @@ static int read_string(IO_CACHE *file, register gptr *to, register uint length) } /* read_string */ -static int file_info_compare(void *a, void *b) +static int file_info_compare(void* cmp_arg __attribute__((unused)), + void *a, void *b) { long lint; |