diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_time.h | 3 | ||||
| -rw-r--r-- | include/typelib.h | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/my_time.h b/include/my_time.h index 6aa25487cf1..e3bdb58e5c2 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -51,8 +51,6 @@ typedef long my_time_t; /* two-digit years < this are 20..; >= this are 19.. */ #define YY_PART_YEAR 70 -/* apply above magic to years < this */ -#define YY_MAGIC_BELOW 200 /* Flags to str_to_datetime */ #define TIME_FUZZY_DATE 1 @@ -95,6 +93,7 @@ int check_time_range(struct st_mysql_time *, int *warning); long calc_daynr(uint year,uint month,uint day); uint calc_days_in_year(uint year); +uint year_2000_handling(uint year); void init_time(void); diff --git a/include/typelib.h b/include/typelib.h index e04ec20f2bc..aa51864749f 100644 --- a/include/typelib.h +++ b/include/typelib.h @@ -26,8 +26,9 @@ typedef struct st_typelib { /* Different types saved here */ unsigned int *type_lengths; } TYPELIB; -extern int find_type(char *x, const TYPELIB *typelib, - unsigned int full_name); +extern int find_type_or_exit(const char *x, TYPELIB *typelib, + const char *option); +extern int find_type(char *x, const TYPELIB *typelib, unsigned int full_name); extern void make_type(char *to,unsigned int nr,TYPELIB *typelib); extern const char *get_type(TYPELIB *typelib,unsigned int nr); extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from); |