summaryrefslogtreecommitdiff
path: root/sql/tztime.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/tztime.h')
-rw-r--r--sql/tztime.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/sql/tztime.h b/sql/tztime.h
index 334b14f4fc4..aabec260ec7 100644
--- a/sql/tztime.h
+++ b/sql/tztime.h
@@ -19,15 +19,8 @@
#pragma interface /* gcc class interface */
#endif
-/*
- Portable time_t replacement.
- Should be signed and hold seconds for 1902-2038 range.
-*/
-typedef long my_time_t;
-#define MY_TIME_T_MAX LONG_MAX
-#define MY_TIME_T_MIN LONG_MIN
-
#if !defined(TESTTIME) && !defined(TZINFO2SQL)
+
/*
This class represents abstract time zone and provides
basic interface for TIME <-> my_time_t conversion.
@@ -66,7 +59,8 @@ public:
extern Time_zone * my_tz_UTC;
extern Time_zone * my_tz_SYSTEM;
-extern Time_zone * my_tz_find(THD *thd, const String *name);
+extern TABLE_LIST * my_tz_get_table_list(THD *thd);
+extern Time_zone * my_tz_find(const String *name, TABLE_LIST *tz_tables);
extern my_bool my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap);
extern void my_tz_free();