Commit c7efce7e authored by mleich@five.local.lan's avatar mleich@five.local.lan
Browse files

Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean 

into  five.local.lan:/work/merge/mysql-5.0-build
parents c0191894 9ff7a0ce

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -1474,7 +1474,7 @@ int main(int argc, char** argv) 
  DBUG_ENTER("main");

  DBUG_PROCESS(argv[0]);



  init_time(); // for time functions

  my_init_time(); // for time functions



  parse_args(&argc, (char***)&argv);

  defaults_argv=argv;

include/my_time.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 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);

void my_init_time(void);





/*

sql-common/my_time.c

+3 −3
Original line number Diff line number Diff line
@@ -704,9 +704,9 @@ int check_time_range(struct st_mysql_time *my_time, int *warning) 
  Prepare offset of system time zone from UTC for my_system_gmt_sec() func.



  SYNOPSIS

    init_time()

    my_init_time()

*/

void init_time(void)

void my_init_time(void)

{

  time_t seconds;

  struct tm *l_time,tm_tmp;
@@ -795,7 +795,7 @@ long calc_daynr(uint year,uint month,uint day) 
  NOTES

    The idea is to cache the time zone offset from UTC (including daylight 

    saving time) for the next call to make things faster. But currently we 

    just calculate this offset during startup (by calling init_time() 

    just calculate this offset during startup (by calling my_init_time() 

    function) and use it all the time.

    Time value provided should be legal time value (e.g. '2003-01-01 25:00:00'

    is not allowed).

sql/init.cc

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void unireg_init(ulong options) 
  wild_many='%'; wild_one='_'; wild_prefix='\\'; /* Change to sql syntax */



  current_pid=(ulong) getpid();		/* Save for later ref */

  init_time();				/* Init time-functions (read zone) */

  my_init_time();			/* Init time-functions (read zone) */

#ifndef EMBEDDED_LIBRARY

  my_abort_hook=unireg_abort;		/* Abort with close of databases */

#endif

sql/tztime.cc

+2 −2
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ class Time_zone_system : public Time_zone 
    return lowest possible my_time_t in case of ambiguity or if we

    provide time corresponding to the time-gap.



    You should call init_time() function before using this function.

    You should call my_init_time() function before using this function.



  RETURN VALUE

    Corresponding my_time_t value or 0 in case of error
@@ -2757,7 +2757,7 @@ main(int argc, char **argv) 
  }

  printf("gmt_sec_to_TIME = localtime for time_t in [1000000000,1100000000) range\n");



  init_time();

  my_init_time();



  /*

    Be careful here! my_system_gmt_sec doesn't fully handle unnormalized