database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug#6031 - To drop database you have to execute DROP DATABASE command twice.

Browse Source 
DROP DATABASE failed because of file ext not in TYPELIB of known extensions.
  General solution - construct a TYPELIB at runtime instead of a static list.
This commit is contained in:
acurtis@pcgem.rdg.cyberkinetica.com
2004-11-10 15:07:11 +00:00
parent f08a29d85a
commit dd1cd8aa46
6 changed files with 81 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_db.cc
View File

@ -30,11 +30,6 @@ const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", NullS};
static TYPELIB deletable_extentions=
{array_elements(del_exts)-1,"del_exts", del_exts, NULL};
const char *known_exts[]=
{".ISM",".ISD",".ISM",".MRG",".MYI",".MYD",".db", ".ibd", NullS};
static TYPELIB known_extentions=
{array_elements(known_exts)-1,"known_exts", known_exts, NULL};
static long mysql_rm_known_files(THD *thd, MY_DIR *dirp,
const char *db, const char *path,
uint level);
@ -737,7 +732,7 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
extension= fn_ext(file->name);
if (find_type(extension, &deletable_extentions,1+2) <= 0)
{
if (find_type(extension, &known_extentions,1+2) <= 0)
if (find_type(extension, ha_known_exts(),1+2) <= 0)
found_other_files++;
continue;
}