From 0bbd2991611967086e263bee3cb7bfa20cf86d79 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Mon, 29 Jan 2018 22:08:44 +0300
Subject: [PATCH] Fix a merge error in MDEV-12179 code in
 process_gtid_pos_table

---
 sql/rpl_rli.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 321eef977000d..e03230081d5fd 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);