database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge remote-tracking branch '10.0' into 10.1

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2018-03-15 03:45:28 +02:00
parent 782fb1e016 3d5dff6cae
commit 8152c52e1a
7 changed files with 75 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_time.cc
View File

@ -959,6 +959,8 @@ bool date_add_interval(MYSQL_TIME *ltime, interval_type int_type,
ltime->day= 0;
return 0;
}
else if (ltime->neg)
goto invalid_date;
if (int_type != INTERVAL_DAY)
ltime->time_type= MYSQL_TIMESTAMP_DATETIME; // Return full date