1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge branch '10.2' into 10.3

This commit is contained in:
Oleksandr Byelkin
2019-05-12 17:20:23 +02:00
255 changed files with 3975 additions and 1186 deletions

View File

@ -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))