database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Removed mysql_tzinfo_to_sql dependancy on sql/mysql_priv.h for circumventing

Browse Source 
problems with unresolved dependancies on some platforms.


sql/mysql_priv.h:
  Moved my_time_t definitions to tztime.h to avoid mysql_tzinfo_to_sql dependancy
  on mysql_priv.h.
sql/tztime.cc:
  Removed mysql_tzinfo_to_sql dependancy from mysql_priv.h
sql/tztime.h:
  Moved my_time_t definitions to tztime.h to avoid mysql_tzinfo_to_sql dependancy
  on mysql_priv.h.
This commit is contained in:
unknown
2004-06-25 21:04:48 +04:00
parent d1e4305187
commit 84f61e5a0b
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/mysql_priv.h
View File

@ -40,14 +40,6 @@ extern const key_map key_map_empty;
extern const key_map key_map_full; extern const key_map key_map_full;
extern const char *primary_key_name; extern const char *primary_key_name;
/*
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
#include "mysql_com.h" #include "mysql_com.h"
#include <violite.h> #include <violite.h>
#include "unireg.h" #include "unireg.h"

14
sql/tztime.cc
View File

@ -24,7 +24,18 @@
#pragma implementation // gcc: Class implementation #pragma implementation // gcc: Class implementation
#endif #endif
/*
We should not include mysql_priv.h in mysql_tzinfo_to_sql utility since
it creates unsolved link dependencies on some platforms.
*/
#if !defined(TZINFO2SQL) && !defined(TESTTIME)
#include "mysql_priv.h" #include "mysql_priv.h"
#else
#include <my_global.h>
#include "tztime.h"
#include <my_sys.h>
#endif
#include "tzfile.h" #include "tzfile.h"
#include <m_string.h> #include <m_string.h>
#include <my_dir.h> #include <my_dir.h>
@ -486,6 +497,8 @@ prepare_tz_info(TIME_ZONE_INFO *sp, MEM_ROOT *storage)
} }
#if !defined(TZINFO2SQL)
static const uint mon_lengths[2][MONS_PER_YEAR]= static const uint mon_lengths[2][MONS_PER_YEAR]=
{ {
{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
@ -922,6 +935,7 @@ TIME_to_gmt_sec(const TIME *t, const TIME_ZONE_INFO *sp, bool *in_dst_time_gap)
/* /*
End of elsie derived code. End of elsie derived code.
*/ */
#endif /* !defined(TZINFO2SQL) */
#if !defined(TESTTIME) && !defined(TZINFO2SQL) #if !defined(TESTTIME) && !defined(TZINFO2SQL)

8
sql/tztime.h
View File

@ -19,6 +19,14 @@
#pragma interface /* gcc class interface */ #pragma interface /* gcc class interface */
#endif #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) #if !defined(TESTTIME) && !defined(TZINFO2SQL)
/* /*
This class represents abstract time zone and provides This class represents abstract time zone and provides