1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-32527 Server aborts during alter operation when table doesn't have foreign index

Browse Source 
Problem:
========
InnoDB fails to find the foreign key index for the
foreign key relation in the table while iterating the
foreign key constraints during alter operation. This is
caused by commit 5f09b53bdb4e973e7c7ec2c53a24c98321223f98
(MDEV-31086).

Fix:
====
In check_col_is_in_fk_indexes(), while iterating through
the foreign key relationship, InnoDB should consider that
foreign key relation may not have foreign index when
foreign key check is disabled.
This commit is contained in:
Thirunarayanan Balathandayuthapani 2023-10-20 13:17:40 +05:30
parent 186ac474dd
commit 7d89dcf1ae
3 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/suite/innodb/r/fk_col_alter.result
View File

@ -105,4 +105,17 @@ ALTER TABLE t MODIFY f VARCHAR(8);
ALTER TABLE t MODIFY vf VARCHAR(18);
ERROR HY000: This is not yet supported for generated columns
DROP TABLE t;
#
# MDEV-32527 Server aborts during alter operation
# when table doesn't have foreign index
#
CREATE TABLE t1 (f1 INT NOT NULL, INDEX(f1)) ENGINE=InnoDB;
CREATE TABLE t2(f1 INT NOT NULL, f2 VARCHAR(100) DEFAULT NULL,
INDEX idx(f1, f2),
FOREIGN KEY(f1) REFERENCES t1(f1))ENGINE=INNODB;
SET SESSION FOREIGN_KEY_CHECKS = OFF;
ALTER TABLE t2 DROP INDEX idx;
ALTER TABLE t2 MODIFY f2 VARCHAR(1023);
SET SESSION FOREIGN_KEY_CHECKS = ON;
DROP TABLE t2, t1;
# End of 10.4 tests

14
mysql-test/suite/innodb/t/fk_col_alter.test
View File

@ -139,4 +139,18 @@ ALTER TABLE t MODIFY f VARCHAR(8);
--error ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN
ALTER TABLE t MODIFY vf VARCHAR(18);
DROP TABLE t;
--echo #
--echo # MDEV-32527 Server aborts during alter operation
--echo # when table doesn't have foreign index
--echo #
CREATE TABLE t1 (f1 INT NOT NULL, INDEX(f1)) ENGINE=InnoDB;
CREATE TABLE t2(f1 INT NOT NULL, f2 VARCHAR(100) DEFAULT NULL,
INDEX idx(f1, f2),
FOREIGN KEY(f1) REFERENCES t1(f1))ENGINE=INNODB;
SET SESSION FOREIGN_KEY_CHECKS = OFF;
ALTER TABLE t2 DROP INDEX idx;
ALTER TABLE t2 MODIFY f2 VARCHAR(1023);
SET SESSION FOREIGN_KEY_CHECKS = ON;
DROP TABLE t2, t1;
--echo # End of 10.4 tests

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

@ -7680,20 +7680,17 @@ bool check_col_is_in_fk_indexes(
{
char *fk_id= nullptr;
for (dict_foreign_set::iterator it= table->foreign_set.begin();
it!= table->foreign_set.end();)
for (const auto &f : table->foreign_set)
{
if (std::find(drop_fk.begin(), drop_fk.end(), (*it))
!= drop_fk.end())
goto next_item;
for (ulint i= 0; i < (*it)->n_fields; i++)
if ((*it)->foreign_index->fields[i].col == col)
if (!f->foreign_index ||
std::find(drop_fk.begin(), drop_fk.end(), f) != drop_fk.end())
continue;
for (ulint i= 0; i < f->n_fields; i++)
if (f->foreign_index->fields[i].col == col)
{
fk_id= (*it)->id;
goto err_exit;
fk_id= f->id;
goto err_exit;
}
next_item:
it++;
}
for (const auto &a : add_fk)
@ -7703,17 +7700,16 @@ next_item:
if (a->foreign_index->fields[i].col == col)
{
fk_id= a->id;
goto err_exit;
goto err_exit;
}
}
}
for (const auto &f : table->referenced_set)
{
if (!f->referenced_index) continue;
for (ulint i= 0; i < f->n_fields; i++)
{
if (!f->referenced_index)
continue;
if (f->referenced_index->fields[i].col == col)
{
my_error(ER_FK_COLUMN_CANNOT_CHANGE_CHILD, MYF(0),