diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 15:46:27 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 15:46:27 +0000 |
| commit | 31a8cf54c8a7913338480a0571feaf32143b5f64 (patch) | |
| tree | 8847835f515af17d6c090300b138c31e1226731e /sql-common/my_time.c | |
| parent | 7b89b9f5108c80f4f270da922d7e6c182a663719 (diff) | |
| download | mariadb-git-31a8cf54c8a7913338480a0571feaf32143b5f64.tar.gz | |
Revert "MDEV-9293 Connector/C integration"
This reverts commit 7b89b9f5108c80f4f270da922d7e6c182a663719.
Diffstat (limited to 'sql-common/my_time.c')
| -rw-r--r-- | sql-common/my_time.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 5fcb07e45c0..28757a2c96c 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,9 +777,6 @@ 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 |