mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1 innobase/row/row0mysql.c: Auto merged
This commit is contained in:
@ -2575,6 +2575,7 @@ row_drop_table_for_mysql(
|
|||||||
foreign = UT_LIST_GET_FIRST(table->referenced_list);
|
foreign = UT_LIST_GET_FIRST(table->referenced_list);
|
||||||
|
|
||||||
while (foreign && foreign->foreign_table == table) {
|
while (foreign && foreign->foreign_table == table) {
|
||||||
|
check_next_foreign:
|
||||||
foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
|
foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2603,6 +2604,10 @@ row_drop_table_for_mysql(
|
|||||||
goto funct_exit;
|
goto funct_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (foreign && trx->check_foreigns) {
|
||||||
|
goto check_next_foreign;
|
||||||
|
}
|
||||||
|
|
||||||
if (table->n_mysql_handles_opened > 0) {
|
if (table->n_mysql_handles_opened > 0) {
|
||||||
ibool added;
|
ibool added;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user