diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-04-26 14:02:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-26 14:02:37 +0200 |
| commit | 2ce52790ffc72c4a4d3670ebf67c6655450620f2 (patch) | |
| tree | 4be382f34905809f0a19e87574e2b07b91f5cb7c /sql/sql_truncate.cc | |
| parent | caa9023c9ed101acbcf6b9bd821a09daeb8271ee (diff) | |
| parent | 757daa4174ed1b8786d0307852f79885dd08ea89 (diff) | |
| download | mariadb-git-2ce52790ffc72c4a4d3670ebf67c6655450620f2.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/sql_truncate.cc')
| -rw-r--r-- | sql/sql_truncate.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc index 57cb6df55ca..6252caf98b0 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -150,15 +150,11 @@ fk_truncate_illegal_if_parent(THD *thd, TABLE *table) /* Loop over the set of foreign keys for which this table is a parent. */ while ((fk_info= it++)) { - DBUG_ASSERT(!my_strcasecmp(system_charset_info, - fk_info->referenced_db->str, - table->s->db.str)); - - DBUG_ASSERT(!my_strcasecmp(system_charset_info, - fk_info->referenced_table->str, - table->s->table_name.str)); - - if (my_strcasecmp(system_charset_info, fk_info->foreign_db->str, + if (my_strcasecmp(system_charset_info, fk_info->referenced_db->str, + table->s->db.str) || + my_strcasecmp(system_charset_info, fk_info->referenced_table->str, + table->s->table_name.str) || + my_strcasecmp(system_charset_info, fk_info->foreign_db->str, table->s->db.str) || my_strcasecmp(system_charset_info, fk_info->foreign_table->str, table->s->table_name.str)) |