diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-07-03 10:36:09 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-07-03 10:36:09 +0200 |
| commit | c36620ddc3b1824b88711af6f2a853ef55dc1b14 (patch) | |
| tree | 87b911cd9f4a9f2d9269c3514d362060977d0f79 /sql/rpl_gtid.cc | |
| parent | 1d91910b944a801a2bbe138d4258c53eaeb0c473 (diff) | |
| download | mariadb-git-c36620ddc3b1824b88711af6f2a853ef55dc1b14.tar.gz | |
MDEV-12179 post-merge fixes.
Fix LEX_STRING -> LEX_CSTRING issues.
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index fb57babd50f..4101c2ff4ea 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -476,7 +476,7 @@ gtid_check_rpl_slave_state_table(TABLE *table) that is already in use by the current transaction, if any. */ void -rpl_slave_state::select_gtid_pos_table(THD *thd, LEX_STRING *out_tablename) +rpl_slave_state::select_gtid_pos_table(THD *thd, LEX_CSTRING *out_tablename) { struct gtid_pos_table *list, *table_entry, *default_entry; @@ -589,7 +589,7 @@ rpl_slave_state::record_gtid(THD *thd, const rpl_gtid *gtid, uint64 sub_id, Query_tables_list lex_backup; wait_for_commit* suspended_wfc; void *hton= NULL; - LEX_STRING gtid_pos_table_name; + LEX_CSTRING gtid_pos_table_name; DBUG_ENTER("record_gtid"); *out_hton= NULL; @@ -1287,7 +1287,7 @@ rpl_slave_state::add_gtid_pos_table(rpl_slave_state::gtid_pos_table *entry) struct rpl_slave_state::gtid_pos_table * -rpl_slave_state::alloc_gtid_pos_table(LEX_STRING *table_name, void *hton, +rpl_slave_state::alloc_gtid_pos_table(LEX_CSTRING *table_name, void *hton, rpl_slave_state::gtid_pos_table_state state) { struct gtid_pos_table *p; |