diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:02:21 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:02:21 +0100 |
| commit | d28d3ba40dc8ebef87199a2567ec96e9c5d744e2 (patch) | |
| tree | c6b9ab1d8193fa2a26c5e376d43e536abd3a47ce /sql/item_func.h | |
| parent | ff485d2dc4d5adaf5eef0ccd03ce62adf3bd30b3 (diff) | |
| parent | 6bf10fac445d73fb796d4863612c87bff5f28b66 (diff) | |
| download | mariadb-git-d28d3ba40dc8ebef87199a2567ec96e9c5d744e2.tar.gz | |
10.0-base merge
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 03e67ddf11a..4b1516dcc4d 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -167,7 +167,10 @@ public: Item **item, uint nitems); inline bool get_arg0_time(MYSQL_TIME *ltime) { - return (null_value=args[0]->get_time(ltime)); + null_value= args[0]->get_time(ltime); + DBUG_ASSERT(null_value || + ltime->time_type != MYSQL_TIMESTAMP_TIME || ltime->day == 0); + return null_value; } bool is_null() { update_null_value(); |