database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Adding patch for security bug 19471516

Browse Source
This commit is contained in:
Murthy Narkedimilli
2014-09-08 11:33:55 +02:00
parent 6f012e0799
commit a2375bdbe0
3 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/suite/innodb/r/foreign-keys.result Normal file
View File

@@ -0,0 +1,16 @@
#
# Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
# ADD FOREIGN KEY
#
CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
PRIMARY KEY (`department_id`)) engine=innodb;
CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
`title_reporter_fk` INT, PRIMARY KEY (`title_id`));
CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`));
ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
`people` (`people_id`);
ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
(`people_id`);
ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
(`people_id`);
drop table title, department, people;

26
mysql-test/suite/innodb/t/foreign-keys.test Normal file
View File

@@ -0,0 +1,26 @@
--source include/have_innodb.inc
--source include/have_debug.inc
--echo #
--echo # Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
--echo # ADD FOREIGN KEY
--echo #
CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
PRIMARY KEY (`department_id`)) engine=innodb;
CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
`title_reporter_fk` INT, PRIMARY KEY (`title_id`));
CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`));
ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
`people` (`people_id`);
ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
(`people_id`);
ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
(`people_id`);
drop table title, department, people;

10
storage/innobase/dict/dict0dict.c
View File

@@ -1123,6 +1123,11 @@ dict_table_rename_in_cache(
/* The id will be changed. So remove old one */ /* The id will be changed. So remove old one */
rbt_delete(foreign->foreign_table->foreign_rbt, foreign->id); rbt_delete(foreign->foreign_table->foreign_rbt, foreign->id);
if (foreign->referenced_table) {
rbt_delete(foreign->referenced_table->referenced_rbt,
foreign->id);
}
if (ut_strlen(foreign->foreign_table_name) if (ut_strlen(foreign->foreign_table_name)
< ut_strlen(table->name)) { < ut_strlen(table->name)) {
/* Allocate a longer name buffer; /* Allocate a longer name buffer;
@@ -1273,6 +1278,11 @@ dict_table_rename_in_cache(
rbt_insert(foreign->foreign_table->foreign_rbt, rbt_insert(foreign->foreign_table->foreign_rbt,
foreign->id, &foreign); foreign->id, &foreign);
if (foreign->referenced_table) {
rbt_insert(foreign->referenced_table->referenced_rbt,
foreign->id, &foreign);
}
foreign = UT_LIST_GET_NEXT(foreign_list, foreign); foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
} }