diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-02-21 21:18:41 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-21 21:18:41 +0100 |
commit | c9fc9f73170a8eb16ea968a2ea51b298eb5cdcfc (patch) | |
tree | fb1c75149c75e14bdca91eee6c694e62ebc6cded /sql/item_timefunc.h | |
parent | f93da174c514e001fd0af61bc4fba51f9f8e7c9e (diff) | |
download | mariadb-git-c9fc9f73170a8eb16ea968a2ea51b298eb5cdcfc.tar.gz |
lp:923429 Crash in decimal_cmp on using UNIX_TIMESTAMP with a wrongly formatted timestamp
UNIX_TIMESTAMP() can be null, and returns null for invalid values
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r-- | sql/item_timefunc.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index e1bf53a5baf..8d19e59ddfb 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -385,11 +385,6 @@ public: Item_func_unix_timestamp(Item *a) :Item_func_seconds_hybrid(a) {} const char *func_name() const { return "unix_timestamp"; } bool check_partition_func_processor(uchar *int_arg) {return FALSE;} - void fix_num_length_and_dec() - { - maybe_null= false; - Item_func_seconds_hybrid::fix_num_length_and_dec(); - } /* UNIX_TIMESTAMP() depends on the current timezone (and thus may not be used as a partitioning function) |