mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 18:25:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
This commit is contained in:
unknown 2005-04-13 18:00:14 +02:00
commit 9983cb598f
16 changed files with 123 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
innobase/row/row0mysql.c
View file

@ -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);