summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.cc
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2018-01-29 22:08:44 +0300
committerSergei Petrunia <psergey@askmonty.org>2018-01-29 22:08:44 +0300
commit0bbd2991611967086e263bee3cb7bfa20cf86d79 (patch)
treeb417f6b27c167b714a72e76afaf647d6d8f14347 /sql/rpl_rli.cc
parent28d412411d6cc3b197f5e21bf9d080f702fe721b (diff)
downloadmariadb-git-0bbd2991611967086e263bee3cb7bfa20cf86d79.tar.gz
Fix a merge error in MDEV-12179 code in process_gtid_pos_table
Diffstat (limited to 'sql/rpl_rli.cc')
-rw-r--r--sql/rpl_rli.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 321eef97700..e03230081d5 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -1719,12 +1719,12 @@ process_gtid_pos_table(THD *thd, LEX_CSTRING *table_name, void *hton,
if (!is_default)
{
/* Ignore the redundant table. */
- sql_print_warning(warning_msg, table_name->str, entry->table_name);
+ sql_print_warning(warning_msg, table_name->str, entry->table_name.str);
return 0;
}
else
{
- sql_print_warning(warning_msg, entry->table_name, table_name->str);
+ sql_print_warning(warning_msg, entry->table_name.str, table_name->str);
/* Delete the redundant table, and proceed to add this one instead. */
*next_ptr= entry->next;
my_free(entry);