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/set_var.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/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 55587796281..5f3aff29913 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1320,12 +1320,12 @@ resolve_engine_list_item(THD *thd, plugin_ref *list, uint32 *idx, const char *pos, const char *pos_end, bool error_on_unknown_engine, bool temp_copy) { - LEX_STRING item_str; + LEX_CSTRING item_str; plugin_ref ref; uint32_t i; THD *thd_or_null = (temp_copy ? thd : NULL); - item_str.str= const_cast<char*>(pos); + item_str.str= pos; item_str.length= pos_end-pos; ref= ha_resolve_by_name(thd_or_null, &item_str, false); if (!ref) @@ -1494,7 +1494,7 @@ pretty_print_engine_list(THD *thd, plugin_ref *list) pos= buf; for (p= list; *p; ++p) { - LEX_STRING *name; + LEX_CSTRING *name; size_t remain; remain= buf + size - pos; |