diff options
| author | Gleb Shchepa <gleb.shchepa@oracle.com> | 2010-11-01 02:23:37 +0300 |
|---|---|---|
| committer | Gleb Shchepa <gleb.shchepa@oracle.com> | 2010-11-01 02:23:37 +0300 |
| commit | 89f9f6a40d3a820e6bbacb625aa375575e42aa85 (patch) | |
| tree | 59330b5cd7baa91abdfaefe4ea1c5482ff6dedc7 /sql/item_timefunc.h | |
| parent | d520df90fc68f2e9e41c74ea2c26f0028dbf79dc (diff) | |
| parent | 0389c6aac0bf32718e2166c97ef6dafb25e20e20 (diff) | |
| download | mariadb-git-89f9f6a40d3a820e6bbacb625aa375575e42aa85.tar.gz | |
manual merge 5.1-bugteam --> 5.5-bugteam (bug 52160)
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 004eb83cbeb..72a5aa0c296 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -361,6 +361,7 @@ public: const char *func_name() const { return "time_to_sec"; } void fix_length_and_dec() { + maybe_null= TRUE; decimals=0; max_length=10*MY_CHARSET_BIN_MB_MAXLEN; } |