bk commit into 4.0 tree (Sinisa:1.1751)

[sinisa]

Below is the list of changes that have just been committed into a local
4.0 repository of Sinisa. When Sinisa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1751 04/03/30 13:50:00 Sinisa@stripped +1 -0
  A fix for the error message when database can not be dropped due to
  the extra files being present.

  sql/sql_db.cc
    1.69 04/03/30 13:49:56 Sinisa@stripped +6 -1
    A fix for the error message when database can not be dropped due to
    the extra files being present.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.0

--- 1.68/sql/sql_db.cc	Fri Mar 12 12:53:00 2004
+++ 1.69/sql/sql_db.cc	Tue Mar 30 13:49:56 2004
@@ -325,7 +325,12 @@
     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;