summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-03-19 16:43:03 +0100
committerunknown <serg@serg.mylan>2004-03-19 16:43:03 +0100
commit5395e2e08a53e364a2a55b876877aaa5fb4d32c6 (patch)
tree44d850ce49c64220dd4569cd4dcb9e63374f649b
parent85c7ce36879f0dfc68e26a13b384dc48d79d8100 (diff)
downloadmariadb-git-5395e2e08a53e364a2a55b876877aaa5fb4d32c6.tar.gz
DROP DATABASE now returns (affected_rows) number of tables dropped
-rw-r--r--mysql-test/r/drop.result2
-rw-r--r--sql/sql_db.cc3
2 files changed, 1 insertions, 4 deletions
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
index ca13f22e1eb..8b919964163 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/r/drop.result
@@ -21,7 +21,7 @@ select * from mysqltest.mysqltest;
n
4
drop database if exists mysqltest;
-affected rows: 4
+affected rows: 1
create database mysqltest;
drop database mysqltest;
flush tables with read lock;
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 929be3b30f8..6aaca975e53 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -502,8 +502,6 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
{
if (find_type(extension, &known_extentions,1+2) <= 0)
found_other_files++;
- else
- deleted++;
continue;
}
if (db && !my_strcasecmp(&my_charset_latin1,
@@ -530,7 +528,6 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
{
goto err;
}
- deleted++;
}
}
if (thd->killed ||