From 13946359c68b332641d74ff1e77de8c782d31382 Mon Sep 17 00:00:00 2001 From: "serg@serg.mylan" <> Date: Fri, 19 Mar 2004 16:43:03 +0100 Subject: [PATCH] DROP DATABASE now returns (affected_rows) number of tables dropped --- mysql-test/r/drop.result | 2 +- sql/sql_db.cc | 3 --- 2 files changed, 1 insertion(+), 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 ||