diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-03 15:08:43 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-03 15:08:43 +0400 |
| commit | 62e959437ee5bf64e89c7b16233ab2ca0fd8507c (patch) | |
| tree | 079c8f8c42ced77192c91cbeeb17c5f76923f9ae /sql | |
| parent | a3b99778fc34e778a0ec6248ac1c0a145ba2b5aa (diff) | |
| download | mariadb-git-62e959437ee5bf64e89c7b16233ab2ca0fd8507c.tar.gz | |
MDEV-5374 main.func_time fails with valgrind warning
"Conditional jump or move depends on uninitialised"
in Item_time_typecast::get_date.
Adding "null_value" into the debug assert condition.
Diffstat (limited to 'sql')
| -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 a176d5781ac..0838bbc2e99 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -159,7 +159,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() { |