diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-03-07 16:27:49 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-03-07 16:27:49 +0100 |
| commit | 19a3c29d64e050a4ab99621856455361ffe56eb0 (patch) | |
| tree | 4336e36c75130d3dc6b159bdf5a83883e1e22a63 /sql/item_timefunc.cc | |
| parent | a8a757c6bb32bbf291afdf33df861127489889ab (diff) | |
| download | mariadb-git-19a3c29d64e050a4ab99621856455361ffe56eb0.tar.gz | |
lp:730627 TIME_to_ulonglong: Assertion `0' failed in 5.1-micro on wrong argument to MAKETIME
correct the return value of Item_func_maketime::get_date()
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index aa42d869df5..feae39e1509 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2582,7 +2582,7 @@ bool Item_func_maketime::get_date(MYSQL_TIME *ltime, uint fuzzy_date) args[2]->null_value || minute < 0 || minute > 59 || second < 0 || second > 59))) - return 0; + return 1; bzero(ltime, sizeof(*ltime)); ltime->time_type= MYSQL_TIMESTAMP_TIME; |