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 /mysql-test/r/func_time.result | |
| 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 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 54cd79113d4..bfbc33b6cab 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1427,3 +1427,6 @@ Warning 1292 Incorrect datetime value: '2010-40-50' select subtime('0000-00-10 10:10:10', '30 10:00:00'); subtime('0000-00-10 10:10:10', '30 10:00:00') NULL +select maketime(20,61,10)+0; +maketime(20,61,10)+0 +NULL |