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/sys_vars.ic | |
| parent | 1d91910b944a801a2bbe138d4258c53eaeb0c473 (diff) | |
| download | mariadb-git-c36620ddc3b1824b88711af6f2a853ef55dc1b14.tar.gz | |
MDEV-12179 post-merge fixes.
Fix LEX_STRING -> LEX_CSTRING issues.
Diffstat (limited to 'sql/sys_vars.ic')
| -rw-r--r-- | sql/sys_vars.ic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index 9b0553015a5..4cc40d1aafc 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -1637,9 +1637,9 @@ public: { return (uchar*)pretty_print_engine_list(thd, plugins); } - uchar *session_value_ptr(THD *thd, const LEX_STRING *base) + uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) { return valptr(thd, session_var(thd, plugin_ref*)); } - uchar *global_value_ptr(THD *thd, const LEX_STRING *base) + uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) { return valptr(thd, global_var(plugin_ref*)); } uchar *default_value_ptr(THD *thd) { return valptr(thd, get_default(thd)); } |