diff options
| -rw-r--r-- | mysql-test/r/drop.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/drop.test | 2 | ||||
| -rw-r--r-- | sql/sql_db.cc | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result index 3748af1b8f9..ca13f22e1eb 100644 --- a/mysql-test/r/drop.result +++ b/mysql-test/r/drop.result @@ -21,6 +21,7 @@ select * from mysqltest.mysqltest; n 4 drop database if exists mysqltest; +affected rows: 4 create database mysqltest; drop database mysqltest; flush tables with read lock; diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test index 43329a849f8..88c47803f48 100644 --- a/mysql-test/t/drop.test +++ b/mysql-test/t/drop.test @@ -24,7 +24,9 @@ create database mysqltest; create table mysqltest.mysqltest (n int); insert into mysqltest.mysqltest values (4); select * from mysqltest.mysqltest; +--enable_info drop database if exists mysqltest; +--disable_info create database mysqltest; drop database mysqltest; diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 80669089fc4..32874c48599 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -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) found_other_files++; + else + deleted++; continue; } 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 */ (*tot_list_next)= table_list; tot_list_next= &table_list->next; + deleted++; } else { |