mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better fix for mysql_test.cc::do_remove_files_wildcard

Browse source 
client/mysqltest.cc:
  Better fix for do_remove_files_wildcard
This commit is contained in:
Michael Widenius 2011-01-26 21:15:25 +02:00
parent fe36d2a06d
commit c46305ab48
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client/mysqltest.cc
View file

@ -3024,6 +3024,7 @@ void do_remove_files_wildcard(struct st_command *command)
{ {
int error= 0, sys_errno= 0; int error= 0, sys_errno= 0;
uint i; uint i;
size_t directory_length;
MY_DIR *dir_info; MY_DIR *dir_info;
FILEINFO *file; FILEINFO *file;
char dir_separator[2]; char dir_separator[2];
@ -3054,8 +3055,8 @@ void do_remove_files_wildcard(struct st_command *command)
} }
init_dynamic_string(&ds_file_to_remove, dirname, 1024, 1024); init_dynamic_string(&ds_file_to_remove, dirname, 1024, 1024);
dir_separator[0]= FN_LIBCHAR; dir_separator[0]= FN_LIBCHAR;
dir_separator[1]= 0; dynstr_append_mem(&ds_file_to_remove, dir_separator, 1);
dynstr_append(&ds_file_to_remove, dir_separator); directory_length= ds_file_to_remove.length;
/* Set default wild chars for wild_compare, is changed in embedded mode */ /* Set default wild chars for wild_compare, is changed in embedded mode */
set_wild_chars(1); set_wild_chars(1);
@ -3071,7 +3072,7 @@ void do_remove_files_wildcard(struct st_command *command)
if (ds_wild.length && if (ds_wild.length &&
wild_compare(file->name, ds_wild.str, 0)) wild_compare(file->name, ds_wild.str, 0))
continue; continue;
ds_file_to_remove.length= ds_directory.length; ds_file_to_remove.length= directory_length;
dynstr_append(&ds_file_to_remove, file->name); dynstr_append(&ds_file_to_remove, file->name);
DBUG_PRINT("info", ("removing file: %s", ds_file_to_remove.str)); DBUG_PRINT("info", ("removing file: %s", ds_file_to_remove.str));
if ((error= (my_delete(ds_file_to_remove.str, MYF(MY_WME)) != 0))) if ((error= (my_delete(ds_file_to_remove.str, MYF(MY_WME)) != 0)))