diff options
| author | unknown <mskold@mysql.com> | 2005-04-13 18:00:14 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-04-13 18:00:14 +0200 |
| commit | 9983cb598f6dd3f5692ea3b22d303c3de5a4be3c (patch) | |
| tree | 2d88421b8e0950a508a2ca894fc8b50849d1c3ea /innobase/row | |
| parent | 67d88e8151cb9b6baf3980758b78813c86595a8e (diff) | |
| parent | f698e8825336711bdc37bad0f51cb4fec0552699 (diff) | |
| download | mariadb-git-9983cb598f6dd3f5692ea3b22d303c3de5a4be3c.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
Diffstat (limited to 'innobase/row')
| -rw-r--r-- | innobase/row/row0mysql.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index b13ba056d85..7f78a5b723b 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -2075,7 +2075,7 @@ row_table_add_foreign_constraints( if (err == DB_SUCCESS) { /* Check that also referencing constraints are ok */ - err = dict_load_foreigns(name); + err = dict_load_foreigns(name, trx->check_foreigns); } if (err != DB_SUCCESS) { @@ -3784,6 +3784,8 @@ row_rename_table_for_mysql( goto funct_exit; } + err = dict_load_foreigns(new_name, trx->check_foreigns); + if (row_is_mysql_tmp_table_name(old_name)) { /* MySQL is doing an ALTER TABLE command and it @@ -3793,8 +3795,6 @@ row_rename_table_for_mysql( table. But we want to load also the foreign key constraint definitions for the original table name. */ - err = dict_load_foreigns(new_name); - if (err != DB_SUCCESS) { ut_print_timestamp(stderr); fputs(" InnoDB: Error: in ALTER TABLE ", @@ -3813,8 +3813,6 @@ row_rename_table_for_mysql( trx->error_state = DB_SUCCESS; } } else { - err = dict_load_foreigns(new_name); - if (err != DB_SUCCESS) { ut_print_timestamp(stderr); |