mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-12 10:00:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge following commit from 5.5:

Browse source 
commit ef92aaf9ec
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date:   Wed Jun 22 22:37:28 2016 +0300

    MDEV-10083: Orphan ibd file when playing with foreign keys

    Analysis: row_drop_table_for_mysql did not allow dropping
    referenced table even in case when actual creating of the
    referenced table was not successfull if foreign_key_checks=1.

    Fix: Allow dropping referenced table even if foreign_key_checks=1
    if actual table create returned error.
This commit is contained in:
Jan Lindström 2016-06-23 07:42:40 +03:00
commit 26de9061e8
16 changed files with 272 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/handler/ha_innodb.cc
View file

@ -10686,7 +10686,8 @@ ha_innobase::delete_table(
/* Drop the table in InnoDB */
err = row_drop_table_for_mysql(
norm_name, trx, thd_sql_command(thd) == SQLCOM_DROP_DB);
norm_name, trx, thd_sql_command(thd) == SQLCOM_DROP_DB,
FALSE);
if (err == DB_TABLE_NOT_FOUND
@ -10717,7 +10718,8 @@ ha_innobase::delete_table(
#endif
err = row_drop_table_for_mysql(
par_case_name, trx,
thd_sql_command(thd) == SQLCOM_DROP_DB);
thd_sql_command(thd) == SQLCOM_DROP_DB,
FALSE);
}
}