diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-03-16 14:12:00 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-03-16 14:12:00 +0200 |
| commit | 98eb9518db1da854048b09d94244a982a1d32f9a (patch) | |
| tree | 9f00cc33b5cb43fd11da3c3d62903b4c009bffa0 /sql/sql_time.cc | |
| parent | b0c43d0c381dba1ab859de8f643d8d91dd806009 (diff) | |
| parent | 0a534348c75cf435d2017959855de2efa798fd0b (diff) | |
| download | mariadb-git-98eb9518db1da854048b09d94244a982a1d32f9a.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'sql/sql_time.cc')
| -rw-r--r-- | sql/sql_time.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc index 18ea4e8760b..e3116f73edc 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -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 |