Fix a merge error in MDEV-12179 code in process_gtid_pos_table

MariaDB · Jan 29, 2018 · 0bbd299 · 0bbd299
1 parent 28d4124
commit 0bbd299
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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);