summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 51b875385f1..a6bd1955fa5 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -551,7 +551,12 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
If the directory is a symbolic link, remove the link first, then
remove the directory the symbolic link pointed at
*/
- if (!found_other_files)
+ if (found_other_files)
+ {
+ my_error(ER_DB_DROP_RMDIR, MYF(0), org_path, EEXIST);
+ DBUG_RETURN(-1);
+ }
+ else
{
char tmp_path[FN_REFLEN], *pos;
char *path= tmp_path;