From: Date: January 28 2008 9:50pm
Subject: bk commit into 5.0 tree (jimw:1.2565) BUG#26294
List-Archive: http://lists.mysql.com/commits/41327
X-Bug: 26294
Message-Id: <20080128205049.GA29421@trainedmonkey.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

Below is the list of changes that have just been committed into a local
5.0 repository of jimw.  When jimw does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-28 12:49:47-08:00, jimw@rama.(none) +5 -0
  Rename init_time() to my_init_time() to avoid collision with other
  libraries (particularly libmng). (Bug #26294)

  client/mysqlbinlog.cc@stripped, 2008-01-28 12:49:44-08:00, jimw@rama.(none) +1 -1
    Rename init_time() to my_init_time().

  include/my_time.h@stripped, 2008-01-28 12:49:44-08:00, jimw@rama.(none) +1 -1
    Rename init_time() to my_init_time().

  sql-common/my_time.c@stripped, 2008-01-28 12:49:44-08:00, jimw@rama.(none) +3 -3
    Rename init_time() to my_init_time().

  sql/init.cc@stripped, 2008-01-28 12:49:44-08:00, jimw@rama.(none) +1 -1
    Rename init_time() to my_init_time().

  sql/tztime.cc@stripped, 2008-01-28 12:49:44-08:00, jimw@rama.(none) +2 -2
    Rename init_time() to my_init_time().

diff -Nrup a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
--- a/client/mysqlbinlog.cc	2007-09-13 07:19:43 -07:00
+++ b/client/mysqlbinlog.cc	2008-01-28 12:49:44 -08:00
@@ -1443,7 +1443,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;
diff -Nrup a/include/my_time.h b/include/my_time.h
--- a/include/my_time.h	2007-05-16 01:44:32 -07:00
+++ b/include/my_time.h	2008-01-28 12:49:44 -08:00
@@ -94,7 +94,7 @@ long calc_daynr(uint year,uint month,uin
 uint calc_days_in_year(uint year);
 uint year_2000_handling(uint year);
 
-void init_time(void);
+void my_init_time(void);
 
 
 /*
diff -Nrup a/sql/init.cc b/sql/init.cc
--- a/sql/init.cc	2007-05-28 01:44:57 -07:00
+++ b/sql/init.cc	2008-01-28 12:49:44 -08:00
@@ -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
diff -Nrup a/sql/tztime.cc b/sql/tztime.cc
--- a/sql/tztime.cc	2007-05-16 01:44:42 -07:00
+++ b/sql/tztime.cc	2008-01-28 12:49:44 -08:00
@@ -1035,7 +1035,7 @@ public:
     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
diff -Nrup a/sql-common/my_time.c b/sql-common/my_time.c
--- a/sql-common/my_time.c	2007-11-16 20:57:19 -08:00
+++ b/sql-common/my_time.c	2008-01-28 12:49:44 -08:00
@@ -704,9 +704,9 @@ int check_time_range(struct st_mysql_tim
   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,uin
   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).