diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2004-03-30 13:50:00 +0300 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2004-03-30 13:50:00 +0300 |
| commit | 2ff3f487aa23a03eb65cb07df28350f46b9acc78 (patch) | |
| tree | 2e0acf7bffe13bf7304571f0267c01c5448d4bde | |
| parent | ff5cbb795c49cecb3daa5ed27469073ee4b65d10 (diff) | |
| download | mariadb-git-2ff3f487aa23a03eb65cb07df28350f46b9acc78.tar.gz | |
A fix for the error message when database can not be dropped due to
the extra files being present.
| -rw-r--r-- | sql/sql_db.cc | 7 |
1 files changed, 6 insertions, 1 deletions
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; |