1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com
2005-02-21 14:48:44 +02:00
10 changed files with 145 additions and 137 deletions

View File

@ -1499,16 +1499,38 @@ uint handler::get_dup_key(int error)
}
/*
Delete all files with extension from bas_ext()
SYNOPSIS
delete_table()
name Base name of table
NOTES
We assume that the handler may return more extensions than
was actually used for the file.
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()
*/
int handler::delete_table(const char *name)
{
int error=0;
int error= 0;
int enoent_or_zero= ENOENT; // Error if no file was deleted
for (const char **ext=bas_ext(); *ext ; ext++)
{
if (delete_file(name,*ext,2))
{
if ((error=errno) != ENOENT)
if ((error= my_errno) != ENOENT)
break;
}
else
enoent_or_zero= 0;
error= enoent_or_zero;
}
return error;
}