From: Date: May 26 2005 2:42pm
Subject: bk commit into 4.0 tree (marko:1.2109) BUG#10335
List-Archive: http://lists.mysql.com/internals/25309
X-Bug: 10335
Message-Id: <200505261242.j4QCgSXu032486@hundin.mysql.fi>

Below is the list of changes that have just been committed into a local
4.0 repository of marko. When marko 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2109 05/05/26 15:42:24 marko@stripped +1 -0
  InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335).

  innobase/row/row0mysql.c
    1.79 05/05/26 15:42:21 marko@stripped +5 -0
    row_drop_table_for_mysql(): Check all referencing tables
    when drop_db==TRUE (Bug #10335)

# 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:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/k/mysql-4.0

--- 1.78/innobase/row/row0mysql.c	Sun Feb 13 20:59:58 2005
+++ 1.79/innobase/row/row0mysql.c	Thu May 26 15:42:21 2005
@@ -2143,6 +2143,7 @@
 	foreign = UT_LIST_GET_FIRST(table->referenced_list);
 	
 	while (foreign && foreign->foreign_table == table) {
+	check_next_foreign:
 		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
 	}
 
@@ -2169,6 +2170,10 @@
 		mutex_exit(&dict_foreign_err_mutex);
 
 		goto funct_exit;
+	}
+
+	if (foreign && trx->check_foreigns) {
+		goto check_next_foreign;
 	}
 
 	if (table->n_mysql_handles_opened > 0) {