diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2004-03-30 13:50:00 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2004-03-30 13:50:00 +0300 |
| commit | 7be9b15a2a2e2a0addb97b0098bdd9b7a3224001 (patch) | |
| tree | 2e0acf7bffe13bf7304571f0267c01c5448d4bde /sql/sql_db.cc | |
| parent | 10d802881cf877c68cdc7fe7afb87d4b4805581e (diff) | |
| download | mariadb-git-7be9b15a2a2e2a0addb97b0098bdd9b7a3224001.tar.gz | |
A fix for the error message when database can not be dropped due to
the extra files being present.
Diffstat (limited to 'sql/sql_db.cc')
| -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; |