summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-03-18 11:04:36 +0100
committerunknown <serg@serg.mylan>2004-03-18 11:04:36 +0100
commitee63578fe23de54912074e8d976ca734681baab2 (patch)
treeca8da9ee200ffdf7ac8bb4c593adbfea620ea4a9 /sql/sql_db.cc
parent93ca1bfac6d5607cba6775e20e8f302ad0faf9b8 (diff)
parent84b256013b7831e84d584f9c23efcd5623588129 (diff)
downloadmariadb-git-ee63578fe23de54912074e8d976ca734681baab2.tar.gz
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/sql_db.cc: Auto merged
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 489c8aa425f..929be3b30f8 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -502,6 +502,8 @@ 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,
@@ -519,6 +521,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
{