diff options
| author | holyfoot/hf@mysql.com/hfmain.(none) <> | 2007-04-29 18:46:06 +0500 |
|---|---|---|
| committer | holyfoot/hf@mysql.com/hfmain.(none) <> | 2007-04-29 18:46:06 +0500 |
| commit | 35ca5a4f87816ea3bb43120b568fd53078dcf80e (patch) | |
| tree | 305dac52043ee4eb275a83ea81b31c318a9e874c /sql/time.cc | |
| parent | 2fcebef31fbde737d9a7154b842bbd2c5efbaa92 (diff) | |
| download | mariadb-git-35ca5a4f87816ea3bb43120b568fd53078dcf80e.tar.gz | |
merging fix
Diffstat (limited to 'sql/time.cc')
| -rw-r--r-- | sql/time.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/time.cc b/sql/time.cc index 249de3b879b..c552d085f5e 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -860,8 +860,9 @@ bool date_add_interval(MYSQL_TIME *ltime, interval_type int_type, INTERVAL inter } break; default: - return 1; + goto null_date; } + return 0; // Ok invalid_date: @@ -869,6 +870,7 @@ invalid_date: ER_DATETIME_FUNCTION_OVERFLOW, ER(ER_DATETIME_FUNCTION_OVERFLOW), "datetime"); +null_date: return 1; } |