diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 20:03:05 +0000 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-25 16:27:57 +0200 |
| commit | 56c4cfe0bea0fea8f80692c3df684b204cbfa731 (patch) | |
| tree | dc433fb0f163f8d06498b1cc425c6a57298cf060 /sql-common/my_time.c | |
| parent | 31a8cf54c8a7913338480a0571feaf32143b5f64 (diff) | |
| download | mariadb-git-56c4cfe0bea0fea8f80692c3df684b204cbfa731.tar.gz | |
MDEV-9293 - Use MariaDB's Connector/C in server
Diffstat (limited to 'sql-common/my_time.c')
| -rw-r--r-- | sql-common/my_time.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 28757a2c96c..5fcb07e45c0 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -20,7 +20,7 @@ #include <m_ctype.h> /* Windows version of localtime_r() is declared in my_ptrhead.h */ #include <my_pthread.h> -#include <mysqld_error.h> + ulonglong log_10_int[20]= { @@ -777,6 +777,9 @@ long calc_daynr(uint year,uint month,uint day) DBUG_RETURN(delsum+(int) y/4-temp); } /* calc_daynr */ +/* Can't include mysqld_error.h, it needs mysys to build, thus hardcode 2 error values here. */ +#define ER_WARN_DATA_OUT_OF_RANGE 1264 +#define ER_WARN_INVALID_TIMESTAMP 1299 /* Convert time in MYSQL_TIME representation in system time zone to its |