Commit 67570b8b authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/kostja/mysql/mysql-4.1-root
parents 432e4697 9919574a

include/my_time.h

+9 −0
Original line number Diff line number Diff line
@@ -28,6 +28,15 @@ C_MODE_START 


extern ulonglong log_10_int[20];



/*

  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



#define YY_PART_YEAR	   70



/* Flags to str_to_datetime */

include/mysql_time.h

+8 −10
Original line number Diff line number Diff line
@@ -17,7 +17,14 @@ 
#ifndef _mysql_time_h_

#define _mysql_time_h_



/* Time declarations shared between server and client library */

/*

  Time declarations shared between the server and client API:

  you should not add anything to this header unless it's used

  (and hence should be visible) in mysql.h.

  If you're looking for a place to add new time-related declaration,

  it's most likely my_time.h. See also "C API Handling of Date

  and Time Values" chapter in documentation.

*/



enum enum_mysql_timestamp_type

{
@@ -34,13 +41,4 @@ typedef struct st_mysql_time 
  enum enum_mysql_timestamp_type time_type;

} MYSQL_TIME;





/* 

  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



#endif /* _mysql_time_h_ */

sql/tztime.cc

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "mysql_priv.h"

#else

#include <my_global.h>

#include <my_time.h>

#include "tztime.h"

#include <my_sys.h>

#endif

sql/tztime.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#pragma interface			/* gcc class interface */

#endif



#include <mysql_time.h>



#if !defined(TESTTIME) && !defined(TZINFO2SQL)



/*