From 7be9b15a2a2e2a0addb97b0098bdd9b7a3224001 Mon Sep 17 00:00:00 2001 From: unknown <Sinisa@sinisa.nasamreza.org> Date: Tue, 30 Mar 2004 13:50:00 +0300 Subject: [PATCH] A fix for the error message when database can not be dropped due to the extra files being present. --- sql/sql_db.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 1217a909071..d91fdbaded0 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -325,7 +325,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; -- 2.30.9