diff options
| author | monty@mishka.local <> | 2004-04-26 15:53:31 +0300 |
|---|---|---|
| committer | monty@mishka.local <> | 2004-04-26 15:53:31 +0300 |
| commit | 21fd1d270eb58fa95551bb6e37ecef5a30785929 (patch) | |
| tree | 25e3315af05fa92d20d2ad1d812882957c400337 /sql/sql_db.cc | |
| parent | 7d9a9fd93ac4622d596920169a6d6afbd787c377 (diff) | |
| parent | 7d3e633edc5db31c0698660ed644d7a18faea41c (diff) | |
| download | mariadb-git-21fd1d270eb58fa95551bb6e37ecef5a30785929.tar.gz | |
Merge with 4.0
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 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; |