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
2b1c712d
Commit
2b1c712d
authored
19 years ago
by
ramil@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
a fix (bug #7205: "archive" test fails on UnixWare when using prepared statements)
parent
ca336ad1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
11 deletions
+4
-11
sql/handler.cc
sql/handler.cc
+4
-11
No files found.
sql/handler.cc
View file @
2b1c712d
...
...
@@ -55,8 +55,6 @@
/* static functions defined in this file */
static
int
NEAR_F
delete_file
(
const
char
*
name
,
const
char
*
ext
,
int
extflag
);
static
SHOW_COMP_OPTION
have_yes
=
SHOW_OPTION_YES
;
/* list of all available storage engines (of their handlertons) */
...
...
@@ -1585,17 +1583,19 @@ uint handler::get_dup_key(int error)
RETURN
0 If we successfully deleted at least one file from base_ext and
didn't get any other errors than ENOENT
# Error
from delete_file()
# Error
*/
int
handler
::
delete_table
(
const
char
*
name
)
{
int
error
=
0
;
int
enoent_or_zero
=
ENOENT
;
// Error if no file was deleted
char
buff
[
FN_REFLEN
];
for
(
const
char
**
ext
=
bas_ext
();
*
ext
;
ext
++
)
{
if
(
delete_file
(
name
,
*
ext
,
2
))
fn_format
(
buff
,
name
,
""
,
*
ext
,
2
|
4
);
if
(
my_delete_with_symlink
(
buff
,
MYF
(
0
)))
{
if
((
error
=
my_errno
)
!=
ENOENT
)
break
;
...
...
@@ -1766,13 +1766,6 @@ err_end:
DBUG_RETURN
(
error
);
}
static
int
NEAR_F
delete_file
(
const
char
*
name
,
const
char
*
ext
,
int
extflag
)
{
char
buff
[
FN_REFLEN
];
VOID
(
fn_format
(
buff
,
name
,
""
,
ext
,
extflag
|
4
));
return
(
my_delete_with_symlink
(
buff
,
MYF
(
MY_WME
)));
}
void
st_ha_check_opt
::
init
()
{
flags
=
sql_flags
=
0
;
...
...
This diff is collapsed.
Click to expand it.
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