diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-12-26 14:58:02 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-12-26 15:25:39 +0300 |
| commit | 04451f0f8a29d6b0e31d062e51edbf6d2d761604 (patch) | |
| tree | 1a404205d18e5fce6ac9a87a1da0469d73cf3764 /sql/sys_vars.ic | |
| parent | 11c688274167cd99634fa85190c89d78e07662c1 (diff) | |
| download | mariadb-git-04451f0f8a29d6b0e31d062e51edbf6d2d761604.tar.gz | |
MDEV-14765 Server crashes in Sys_var_vers_asof::update
Diffstat (limited to 'sql/sys_vars.ic')
| -rw-r--r-- | sql/sys_vars.ic | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index 200669a5bf5..e012cd48ecb 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -2640,7 +2640,15 @@ private: out.type= static_cast<enum_var_type>(var->save_result.ulonglong_value); if (out.type == SYSTEM_TIME_AS_OF) { - res= var->value->get_date(&out.ltime, 0); + if (var->value) + { + res= var->value->get_date(&out.ltime, 0); + } + else // set DEFAULT from global var + { + out= global_var(vers_asof_timestamp_t); + res= false; + } } return res; } |