diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
| commit | 04a4b4334650b2183d25a7b04c1e83c31bffb22d (patch) | |
| tree | 587654c186615669df8d81b851db711bb8ac2f62 /sql/item_timefunc.h | |
| parent | 37a78d6868d0e25d286299c91d5787fb6733844d (diff) | |
| parent | 60c15066db4f59e0362420d46a1ca5b6fbb30e56 (diff) | |
| download | mariadb-git-04a4b4334650b2183d25a7b04c1e83c31bffb22d.tar.gz | |
merge with 5.1
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index e11449c200e..22df9f34926 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -917,6 +917,8 @@ public: { decimals=0; max_length=MAX_DATE_WIDTH*MY_CHARSET_BIN_MB_MAXLEN; + /* It returns NULL when the second argument is less or equal to 0 */ + maybe_null= 1; } longlong val_int(); }; |