Mirrors
/
mariadb
mirror of https://github.com/MariaDB/server
3
0
Fork 0
Code Releases Activity
Browse Source

MDEV-18016: Assertion failure on ALTER TABLE after foreign_key_checks=0 

ha_innobase::commit_inplace_alter_table(): Do not crash if
innobase_update_foreign_cache() returns an error. It can return
an error on ALTER TABLE if an inconsistent FOREIGN KEY constraint
was created earlier when SET foreign_key_checks=0 was in effect.
Instead, report a warning to the client that constraints cannot
be loaded.
10.0
Marko Mäkelä 7 years ago
parent
6699cac0bf
commit
1522ee2949
4 changed files with 68 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      mysql-test/suite/innodb/r/foreign_key.result
  2. 8
      mysql-test/suite/innodb/t/foreign_key.test
  3. 58
      storage/innobase/handler/handler0alter.cc
  4. 58
      storage/xtradb/handler/handler0alter.cc

12
mysql-test/suite/innodb/r/foreign_key.result
View File

@ -70,3 +70,15 @@ CREATE TABLE t2 (b INT PRIMARY KEY, FOREIGN KEY fk1 (b) REFERENCES t1 (a))
ENGINE=InnoDB;
ALTER TABLE t2 DROP FOREIGN KEY fk1, DROP FOREIGN KEY fk1;
DROP TABLE t2, t1;
CREATE TABLE t1 (f VARCHAR(256)) ENGINE=InnoDB;
SET SESSION FOREIGN_KEY_CHECKS = OFF;
ALTER TABLE t1 ADD FOREIGN KEY (f) REFERENCES non_existing_table (x);
SET SESSION FOREIGN_KEY_CHECKS = ON;
ALTER TABLE t1 ADD FULLTEXT INDEX ft1 (f);
Warnings:
Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID
Warning 1088 failed to load FOREIGN KEY constraints
ALTER TABLE t1 ADD FULLTEXT INDEX ft2 (f);
Warnings:
Warning 1088 failed to load FOREIGN KEY constraints
DROP TABLE t1;

8
mysql-test/suite/innodb/t/foreign_key.test
View File

@ -96,3 +96,11 @@ CREATE TABLE t2 (b INT PRIMARY KEY, FOREIGN KEY fk1 (b) REFERENCES t1 (a))
ENGINE=InnoDB;
ALTER TABLE t2 DROP FOREIGN KEY fk1, DROP FOREIGN KEY fk1;
DROP TABLE t2, t1;
CREATE TABLE t1 (f VARCHAR(256)) ENGINE=InnoDB;
SET SESSION FOREIGN_KEY_CHECKS = OFF;
ALTER TABLE t1 ADD FOREIGN KEY (f) REFERENCES non_existing_table (x);
SET SESSION FOREIGN_KEY_CHECKS = ON;
ALTER TABLE t1 ADD FULLTEXT INDEX ft1 (f);
ALTER TABLE t1 ADD FULLTEXT INDEX ft2 (f);
DROP TABLE t1;

58
storage/innobase/handler/handler0alter.cc
View File

@ -5638,7 +5638,6 @@ ha_innobase::commit_inplace_alter_table(
Alter_inplace_info* ha_alter_info,
bool commit)
{
dberr_t error;
ha_innobase_inplace_ctx* ctx0
= static_cast<ha_innobase_inplace_ctx*>
(ha_alter_info->handler_ctx);
@ -5705,7 +5704,7 @@ ha_innobase::commit_inplace_alter_table(
transactions collected during crash recovery could be
holding InnoDB locks only, not MySQL locks. */
error = row_merge_lock_table(
dberr_t error = row_merge_lock_table(
prebuilt->trx, ctx->old_table, LOCK_X);
if (error != DB_SUCCESS) {
@ -5890,9 +5889,9 @@ rollback_trx:
file operations that will be performed in
commit_cache_rebuild(), and if none, generate
the redo log for these operations. */
error = fil_mtr_rename_log(ctx->old_table,
ctx->new_table,
ctx->tmp_name, &mtr);
dberr_t error = fil_mtr_rename_log(
ctx->old_table, ctx->new_table, ctx->tmp_name,
&mtr);
if (error != DB_SUCCESS) {
/* Out of memory or a problem will occur
when renaming files. */
@ -6017,39 +6016,30 @@ rollback_trx:
/* Rename the tablespace files. */
commit_cache_rebuild(ctx);
error = innobase_update_foreign_cache(ctx, user_thd);
if (error != DB_SUCCESS) {
goto foreign_fail;
if (innobase_update_foreign_cache(ctx, user_thd)
!= DB_SUCCESS
&& prebuilt->trx->check_foreigns) {
foreign_fail:
push_warning_printf(
user_thd,
Sql_condition::WARN_LEVEL_WARN,
ER_ALTER_INFO,
"failed to load FOREIGN KEY"
" constraints");
}
} else {
error = innobase_update_foreign_cache(ctx, user_thd);
bool fk_fail = innobase_update_foreign_cache(
ctx, user_thd) != DB_SUCCESS;
if (error != DB_SUCCESS) {
foreign_fail:
/* The data dictionary cache
should be corrupted now. The
best solution should be to
kill and restart the server,
but the *.frm file has not
been replaced yet. */
my_error(ER_CANNOT_ADD_FOREIGN,
MYF(0));
sql_print_error(
"InnoDB: dict_load_foreigns()"
" returned %u for %s",
(unsigned) error,
thd_query_string(user_thd)
->str);
ut_ad(0);
} else {
if (!commit_cache_norebuild(
ctx, table, trx)) {
ut_a(!prebuilt->trx->check_foreigns);
}
if (!commit_cache_norebuild(ctx, table, trx)) {
fk_fail = true;
ut_ad(!prebuilt->trx->check_foreigns);
}
innobase_rename_columns_cache(
ha_alter_info, table,
ctx->new_table);
innobase_rename_columns_cache(ha_alter_info, table,
ctx->new_table);
if (fk_fail && prebuilt->trx->check_foreigns) {
goto foreign_fail;
}
}
DBUG_INJECT_CRASH("ib_commit_inplace_crash",

58
storage/xtradb/handler/handler0alter.cc
View File

@ -5654,7 +5654,6 @@ ha_innobase::commit_inplace_alter_table(
Alter_inplace_info* ha_alter_info,
bool commit)
{
dberr_t error;
ha_innobase_inplace_ctx* ctx0
= static_cast<ha_innobase_inplace_ctx*>
(ha_alter_info->handler_ctx);
@ -5721,7 +5720,7 @@ ha_innobase::commit_inplace_alter_table(
transactions collected during crash recovery could be
holding InnoDB locks only, not MySQL locks. */
error = row_merge_lock_table(
dberr_t error = row_merge_lock_table(
prebuilt->trx, ctx->old_table, LOCK_X);
if (error != DB_SUCCESS) {
@ -5906,9 +5905,9 @@ rollback_trx:
file operations that will be performed in
commit_cache_rebuild(), and if none, generate
the redo log for these operations. */
error = fil_mtr_rename_log(ctx->old_table,
ctx->new_table,
ctx->tmp_name, &mtr);
dberr_t error = fil_mtr_rename_log(
ctx->old_table, ctx->new_table, ctx->tmp_name,
&mtr);
if (error != DB_SUCCESS) {
/* Out of memory or a problem will occur
when renaming files. */
@ -6033,39 +6032,30 @@ rollback_trx:
/* Rename the tablespace files. */
commit_cache_rebuild(ctx);
error = innobase_update_foreign_cache(ctx, user_thd);
if (error != DB_SUCCESS) {
goto foreign_fail;
if (innobase_update_foreign_cache(ctx, user_thd)
!= DB_SUCCESS
&& prebuilt->trx->check_foreigns) {
foreign_fail:
push_warning_printf(
user_thd,
Sql_condition::WARN_LEVEL_WARN,
ER_ALTER_INFO,
"failed to load FOREIGN KEY"
" constraints");
}
} else {
error = innobase_update_foreign_cache(ctx, user_thd);
bool fk_fail = innobase_update_foreign_cache(
ctx, user_thd) != DB_SUCCESS;
if (error != DB_SUCCESS) {
foreign_fail:
/* The data dictionary cache
should be corrupted now. The
best solution should be to
kill and restart the server,
but the *.frm file has not
been replaced yet. */
my_error(ER_CANNOT_ADD_FOREIGN,
MYF(0));
sql_print_error(
"InnoDB: dict_load_foreigns()"
" returned %u for %s",
(unsigned) error,
thd_query_string(user_thd)
->str);
ut_ad(0);
} else {
if (!commit_cache_norebuild(
ctx, table, trx)) {
ut_a(!prebuilt->trx->check_foreigns);
}
if (!commit_cache_norebuild(ctx, table, trx)) {
fk_fail = true;
ut_ad(!prebuilt->trx->check_foreigns);
}
innobase_rename_columns_cache(
ha_alter_info, table,
ctx->new_table);
innobase_rename_columns_cache(ha_alter_info, table,
ctx->new_table);
if (fk_fail && prebuilt->trx->check_foreigns) {
goto foreign_fail;
}
}
DBUG_INJECT_CRASH("ib_commit_inplace_crash",

Write Preview
Loading…
Cancel
Save