diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-11-13 11:06:18 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-11-13 19:09:46 +0300 |
| commit | 497c6add88edae9c7ec6d6d840c0ed65adc016be (patch) | |
| tree | 92eb05976137821fcdf0caf556495a5b55436db0 /sql/sys_vars.ic | |
| parent | d8d725101992d50b00edf149e7ccd7f720b850dc (diff) | |
| parent | a48aa0cd569eda88bef98ed4abe41b0b570fcd51 (diff) | |
| download | mariadb-git-497c6add88edae9c7ec6d6d840c0ed65adc016be.tar.gz | |
System Versioning pre1.0
Merge branch '10.3' into trunk
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 a302bbaa837..a42a8bcf4cf 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -2723,9 +2723,9 @@ public: { DBUG_ASSERT(false); } void global_save_default(THD *thd, set_var *var) { DBUG_ASSERT(false); } - 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, st_vers_current_time)); } - 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(st_vers_current_time)); } uchar *default_value_ptr(THD *thd) { return (uchar *)option.def_value; } |