Commit 3e15849b authored by unknown's avatar unknown
Browse files

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 

into sinisa.nasamreza.org:/mnt/work/mysql-4.0
parents 6b16bf4f 7be9b15a

sql/sql_db.cc

+6 −1
Original line number Diff line number Diff line
@@ -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;