diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 15:31:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 15:31:11 +0300 |
| commit | fdef9f9b8960479919285d6aec0bb30d27fa4723 (patch) | |
| tree | f358b0f34305572ddf5b4fd2466c3a09ba37c7db /storage/innobase/eval | |
| parent | 55d8ff0de8168d3b7d465644dc93dca01f53f4f6 (diff) | |
| parent | a7e9395f9de0cc19cf79064f5df796d98ec19762 (diff) | |
| download | mariadb-git-fdef9f9b8960479919285d6aec0bb30d27fa4723.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/eval')
| -rw-r--r-- | storage/innobase/eval/eval0eval.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/eval/eval0eval.cc b/storage/innobase/eval/eval0eval.cc index fc16b9defb5..577157d2eb9 100644 --- a/storage/innobase/eval/eval0eval.cc +++ b/storage/innobase/eval/eval0eval.cc @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -814,7 +815,7 @@ eval_predefined( dfield_get_data(que_node_get_val(arg1))); } else if (func == PARS_SYSDATE_TOKEN) { - int_val = (lint) ut_time(); + int_val = (lint) time(NULL); } else { eval_predefined_2(func_node); |