Commit 84b25601 authored by unknown's avatar unknown

make DROP DATABASE to behave as documented in the manual - to report number of files deleted

parent 7395d54d
...@@ -21,6 +21,7 @@ select * from mysqltest.mysqltest; ...@@ -21,6 +21,7 @@ select * from mysqltest.mysqltest;
n n
4 4
drop database if exists mysqltest; drop database if exists mysqltest;
affected rows: 4
create database mysqltest; create database mysqltest;
drop database mysqltest; drop database mysqltest;
flush tables with read lock; flush tables with read lock;
......
...@@ -24,7 +24,9 @@ create database mysqltest; ...@@ -24,7 +24,9 @@ create database mysqltest;
create table mysqltest.mysqltest (n int); create table mysqltest.mysqltest (n int);
insert into mysqltest.mysqltest values (4); insert into mysqltest.mysqltest values (4);
select * from mysqltest.mysqltest; select * from mysqltest.mysqltest;
--enable_info
drop database if exists mysqltest; drop database if exists mysqltest;
--disable_info
create database mysqltest; create database mysqltest;
drop database mysqltest; drop database mysqltest;
......
...@@ -500,6 +500,8 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, ...@@ -500,6 +500,8 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
{ {
if (find_type(fn_ext(file->name),&known_extentions,1+2) <= 0) if (find_type(fn_ext(file->name),&known_extentions,1+2) <= 0)
found_other_files++; found_other_files++;
else
deleted++;
continue; continue;
} }
strxmov(filePath,org_path,"/",file->name,NullS); strxmov(filePath,org_path,"/",file->name,NullS);
...@@ -521,6 +523,7 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, ...@@ -521,6 +523,7 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
/* Link into list */ /* Link into list */
(*tot_list_next)= table_list; (*tot_list_next)= table_list;
tot_list_next= &table_list->next; tot_list_next= &table_list->next;
deleted++;
} }
else else
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment