diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-13 13:00:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-13 13:00:38 +0100 |
| commit | e68bccc743ddd5ee9b0e47ff73b57d088f015f17 (patch) | |
| tree | f524c15c650c94dd8bab87899b04ae767544b5a2 /sql/item_func.h | |
| parent | ca083a764f14233dfd7f97436629020901bd23a6 (diff) | |
| parent | 3ec4296ec413e866c3efabc8dfa94172ad5f7c04 (diff) | |
| download | mariadb-git-e68bccc743ddd5ee9b0e47ff73b57d088f015f17.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index bbf7643eaa0..f1dbbb09305 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -160,7 +160,8 @@ public: inline bool get_arg0_time(MYSQL_TIME *ltime) { null_value= args[0]->get_time(ltime); - DBUG_ASSERT(ltime->time_type != MYSQL_TIMESTAMP_TIME || ltime->day == 0); + DBUG_ASSERT(null_value || + ltime->time_type != MYSQL_TIMESTAMP_TIME || ltime->day == 0); return null_value; } bool is_null() { |