mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
unknown 2004-03-18 11:03:24 +01:00
commit 84b256013b
3 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/drop.result
View file

@ -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;

2
mysql-test/t/drop.test
View file

@ -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;

3
sql/sql_db.cc
View file

@ -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,
/* 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
{ {