Skip to content

M
mariadb
Commit 13946359 authored by serg@serg.mylan's avatar serg@serg.mylan
Browse files
Options

DROP DATABASE now returns (affected_rows) number of tables dropped

parent 6a636a4d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
mysql-test/r/drop.result
View file @ 13946359
...@@ -21,7 +21,7 @@ select * from mysqltest.mysqltest; ...@@ -21,7 +21,7 @@ select * from mysqltest.mysqltest;
n n
4 4
drop database if exists mysqltest; drop database if exists mysqltest;
affected rows: 4 affected rows: 1
create database mysqltest; create database mysqltest;
drop database mysqltest; drop database mysqltest;
flush tables with read lock; flush tables with read lock;
......
sql/sql_db.cc
View file @ 13946359
...@@ -502,8 +502,6 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, ...@@ -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) if (find_type(extension, &known_extentions,1+2) <= 0)
found_other_files++; found_other_files++;
else
deleted++;
continue; continue;
} }
if (db && !my_strcasecmp(&my_charset_latin1, 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, ...@@ -530,7 +528,6 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
{ {
goto err; goto err;
} }
deleted++;
} }
} }
if (thd->killed || if (thd->killed ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7