diff options
| author | Alexander Barkov <bar@mariadb.org> | 2014-06-04 21:53:15 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2014-06-04 21:53:15 +0400 |
| commit | 284479c085f005a705d31e37e9cd85bb670d615e (patch) | |
| tree | 044868e9c5a27a60750f3389ca63763f2bbc1ef0 /sql/sql_time.h | |
| parent | 55bfabf9715c15df16adb4a3e8880deb4943df2b (diff) | |
| parent | 661daf16f11ffa879ffb005008b6e73f6744e0ad (diff) | |
| download | mariadb-git-284479c085f005a705d31e37e9cd85bb670d615e.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'sql/sql_time.h')
| -rw-r--r-- | sql/sql_time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.h b/sql/sql_time.h index aa81edbc105..443d22c5419 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -48,7 +48,7 @@ bool double_to_datetime_with_warn(double value, MYSQL_TIME *ltime, bool decimal_to_datetime_with_warn(const my_decimal *value, MYSQL_TIME *ltime, ulonglong fuzzydate, const char *name); -bool int_to_datetime_with_warn(longlong value, MYSQL_TIME *ltime, +bool int_to_datetime_with_warn(bool neg, ulonglong value, MYSQL_TIME *ltime, ulonglong fuzzydate, const char *name); |