Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
c46305ab
Commit
c46305ab
authored
Jan 26, 2011
by
Michael Widenius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better fix for mysql_test.cc::do_remove_files_wildcard
client/mysqltest.cc: Better fix for do_remove_files_wildcard
parent
fe36d2a0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
client/mysqltest.cc
client/mysqltest.cc
+4
-3
No files found.
client/mysqltest.cc
View file @
c46305ab
...
...
@@ -3024,6 +3024,7 @@ void do_remove_files_wildcard(struct st_command *command)
{
int
error
=
0
,
sys_errno
=
0
;
uint
i
;
size_t
directory_length
;
MY_DIR
*
dir_info
;
FILEINFO
*
file
;
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
);
dir_separator
[
0
]
=
FN_LIBCHAR
;
d
ir_separator
[
1
]
=
0
;
d
ynstr_append
(
&
ds_file_to_remove
,
dir_separator
)
;
d
ynstr_append_mem
(
&
ds_file_to_remove
,
dir_separator
,
1
)
;
d
irectory_length
=
ds_file_to_remove
.
length
;
/* Set default wild chars for wild_compare, is changed in embedded mode */
set_wild_chars
(
1
);
...
...
@@ -3071,7 +3072,7 @@ void do_remove_files_wildcard(struct st_command *command)
if
(
ds_wild
.
length
&&
wild_compare
(
file
->
name
,
ds_wild
.
str
,
0
))
continue
;
ds_file_to_remove
.
length
=
d
s_directory
.
length
;
ds_file_to_remove
.
length
=
d
irectory_
length
;
dynstr_append
(
&
ds_file_to_remove
,
file
->
name
);
DBUG_PRINT
(
"info"
,
(
"removing file: %s"
,
ds_file_to_remove
.
str
));
if
((
error
=
(
my_delete
(
ds_file_to_remove
.
str
,
MYF
(
MY_WME
))
!=
0
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment