diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-12 17:20:23 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-12 17:20:23 +0200 |
| commit | c51f85f8823a845cd4a6aa1b2aa5af18484b2ab0 (patch) | |
| tree | 65c45f6100c13dad90c33b86dc68be268139b0b8 /sql/sql_truncate.cc | |
| parent | a89f199c64a1d2339de7c167ce64ec148061a4d3 (diff) | |
| parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
| download | mariadb-git-c51f85f8823a845cd4a6aa1b2aa5af18484b2ab0.tar.gz | |
Merge branch '10.2' into 10.3
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 bab9bb5e9ac..d87fe13b10e 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -147,15 +147,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(!lex_string_cmp(system_charset_info, - fk_info->referenced_db, - &table->s->db)); - - DBUG_ASSERT(!lex_string_cmp(system_charset_info, - fk_info->referenced_table, - &table->s->table_name)); - - if (lex_string_cmp(system_charset_info, fk_info->foreign_db, + if (lex_string_cmp(system_charset_info, fk_info->referenced_db, + &table->s->db) || + lex_string_cmp(system_charset_info, fk_info->referenced_table, + &table->s->table_name) || + lex_string_cmp(system_charset_info, fk_info->foreign_db, &table->s->db) || lex_string_cmp(system_charset_info, fk_info->foreign_table, &table->s->table_name)) |