diff options
Diffstat (limited to 'mysys/my_default.c')
| -rw-r--r-- | mysys/my_default.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c index cc4462a240b..ae576f7a058 100644 --- a/mysys/my_default.c +++ b/mysys/my_default.c @@ -466,7 +466,7 @@ int my_load_defaults(const char *conf_file, const char **groups, int *argc, if (*argc) memcpy(res + args.elements, *argv, *argc * sizeof(char*)); - (*argc)+= args.elements; + (*argc)+= (int)args.elements; *argv= res; (*argv)[*argc]= 0; *(MEM_ROOT*) ptr= alloc; /* Save alloc root for free */ @@ -602,7 +602,7 @@ static int search_default_file_with_ext(struct handle_option_ctx *ctx, MYSQL_FILE *fp; uint line=0; enum { NONE, PARSE, SKIP } found_group= NONE; - uint i; + size_t i; MY_DIR *search_dir; FILEINFO *search_file; @@ -690,7 +690,7 @@ static int search_default_file_with_ext(struct handle_option_ctx *ctx, if (!(search_dir= my_dir(ptr, MYF(MY_WME | MY_WANT_SORT)))) goto err; - for (i= 0; i < (uint) search_dir->number_of_files; i++) + for (i= 0; i < search_dir->number_of_files; i++) { search_file= search_dir->dir_entry + i; ext= fn_ext2(search_file->name); |