Merge bk-internal:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_db.cc:
  Auto merged

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;

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;
 

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
     {