database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with 4.0

Browse Source
This commit is contained in:
monty@mishka.local
2004-04-26 15:53:31 +03:00
parent 7d9a9fd93a 7d3e633edc
commit 21fd1d270e
125 changed files with 4571 additions and 4768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_db.cc
View File

@ -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;