diff options
| author | monty@mysql.com <> | 2004-09-06 15:14:10 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-09-06 15:14:10 +0300 |
| commit | 31122efde725e9b472e467a7cb1807100b7e6b1e (patch) | |
| tree | d9ef905036723648a1d354d0523ef8124e4dee76 /sql/tztime.h | |
| parent | 32594c99899edd6de0053609c087f04dc21fbbfd (diff) | |
| parent | 5d71817c7049e9db5c22e1667a41f57cf558d8ed (diff) | |
| download | mariadb-git-31122efde725e9b472e467a7cb1807100b7e6b1e.tar.gz | |
Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0)
Diffstat (limited to 'sql/tztime.h')
| -rw-r--r-- | sql/tztime.h | 12 |
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(); |