diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-01-27 15:05:23 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-01-27 15:05:23 +0400 |
| commit | 0ad8eaeb56a049df2947516d3d7ec49301d8d09d (patch) | |
| tree | 151f9c4560a15f39d039061a4877e8775b6dc792 /sql/sql_time.h | |
| parent | ba3d0b173a5610905b31b78367c50700e8032b0b (diff) | |
| parent | 7ea9d1e692c69c8715d98a9dbc44289d47a65447 (diff) | |
| download | mariadb-git-0ad8eaeb56a049df2947516d3d7ec49301d8d09d.tar.gz | |
Merge 5.3 -> 5.5
Diffstat (limited to 'sql/sql_time.h')
| -rw-r--r-- | sql/sql_time.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_time.h b/sql/sql_time.h index ab8f0e0b962..f9092769749 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -124,5 +124,6 @@ check_date(const MYSQL_TIME *ltime, ulonglong flags, int *was_cut) } bool check_date_with_warn(const MYSQL_TIME *ltime, ulonglong fuzzy_date, timestamp_type ts_type); - +bool adjust_time_range_with_warn(MYSQL_TIME *ltime, uint dec); + #endif /* SQL_TIME_INCLUDED */ |