diff options
Diffstat (limited to 'sql/sys_vars.ic')
| -rw-r--r-- | sql/sys_vars.ic | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index d8d95046cc2..440890bccfd 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -596,7 +596,7 @@ public: const char *comment, CMD_LINE getopt, enum charset_enum is_os_charset_arg, - const char *def_val, PolyLock *lock) : + const char *def_val, PolyLock *lock= 0) : Sys_var_charptr_base(name_arg, comment, SESSION_VAR(session_track_system_variables), getopt, is_os_charset_arg, def_val, lock, @@ -2634,7 +2634,8 @@ public: if (!Sys_var_enum::do_check(thd, var)) return false; MYSQL_TIME ltime; - bool res= var->value->get_date(<ime, 0); + Datetime::Options opt(TIME_CONV_NONE, thd); + bool res= var->value->get_date(thd, <ime, opt); if (!res) { var->save_result.ulonglong_value= SYSTEM_TIME_AS_OF; @@ -2651,7 +2652,9 @@ private: { if (var->value) { - res= var->value->get_date(&out.ltime, 0); + THD *thd= current_thd; + Datetime::Options opt(TIME_CONV_NONE, thd); + res= var->value->get_date(thd, &out.ltime, opt); } else // set DEFAULT from global var { |