diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 15:27:37 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 15:27:37 +0000 |
| commit | 7b89b9f5108c80f4f270da922d7e6c182a663719 (patch) | |
| tree | 858a3873942f07610fb26685781e8bdbd3ab2c7f /sql-common/my_time.c | |
| parent | daff133ddf9a9d120050703c0b5753979c6190e0 (diff) | |
| download | mariadb-git-7b89b9f5108c80f4f270da922d7e6c182a663719.tar.gz | |
MDEV-9293 Connector/C integration
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 |