[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-odbc
Subject:    bk commit - MyODBC 3.51
From:       venu () mysql ! com
Date:       2002-05-31 0:24:22
[Download RAW message or body]

Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'venu'. When 'venu' does a push, they will
be propogaged to the main repository and within 24 hours after the push
into the public repository. 

For more information on how to access the public repository see
http://www.mysql.com/products/myodbc/faq.html#Development_source

ChangeSet
  1.210 02/05/30 17:24:22 venu@myvenu.com +4 -0
  Added localtime_r to configure for checking 

  myodbc3.h
    1.23 02/05/30 17:22:42 venu@myvenu.com +3 -0

  utility.c
    1.26 02/05/30 17:22:41 venu@myvenu.com +8 -0

  configure.in
    1.10 02/05/30 17:22:40 venu@myvenu.com +8 -0

  acconfig.h
    1.7 02/05/30 17:22:38 venu@myvenu.com +3 -0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	venu
# Host:	myvenu.com
# Root:	/home/venu/src/myodbc-3.51

--- 1.6/acconfig.h	Wed Jan  9 23:07:35 2002
+++ 1.7/acconfig.h	Thu May 30 17:22:38 2002
@@ -44,3 +44,6 @@
 #undef HAVE_SQLGETPRIVATEPROFILESTRING
 
 #undef SYSTEM_ODBC_INI
+
+#undef HAVE_LOCALTIME_R
+

--- 1.9/configure.in	Wed May 29 21:01:19 2002
+++ 1.10/configure.in	Thu May 30 17:22:40 2002
@@ -176,6 +176,14 @@
     EXTRA_LDFLAGS="$withval",EXTRA_LDFLAGS="")
 AC_SUBST(EXTRA_LDFLAGS)
 
+
+#
+# Check if localtime_r exists in libc or not
+#
+
+AC_CHECK_LIB(c, localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)])
+
+
 # if we're working in an older odbc environment,
 # we don't have the SQL* types, so we need to fall
 # back to the old versions

--- 1.25/utility.c	Wed May 29 21:01:22 2002
+++ 1.26/utility.c	Thu May 30 17:22:41 2002
@@ -753,6 +753,7 @@
   
   if (query_log = fopen(DRIVER_QUERY_LOGFILE, "w"))
   {
+#ifdef HAS_LOCALTIME_R
     time_t skr;
     struct tm tm_tmp;
     struct tm *start;
@@ -760,11 +761,13 @@
     skr=time(NULL);
     localtime_r(&skr,&tm_tmp);
     start=&tm_tmp;
+#endif
 
     fprintf(query_log,"----------------------------------------------------------\n");
     fprintf(query_log,"--      %s, VERSION: %s       --\n",DRIVER_NAME, DRIVER_VERSION);    
     fprintf(query_log,"--                                                      --\n");
     fprintf(query_log,"--                    QUERY LOGGING                     --\n");    
+#ifdef HAS_LOCALTIME_R
     fprintf(query_log,"--                                                      --\n");
     fprintf(query_log,"--              TIMESTAMP: %02d%02d%02d %2d:%02d:%02d              --\n", 
                                                                     start->tm_year % 100,
@@ -773,6 +776,7 @@
 	                                                                  start->tm_hour,
 	                                                                  start->tm_min,
 	                                                                  start->tm_sec); 
+#endif
     fprintf(query_log,"----------------------------------------------------------\n\n"); 
   }
   return query_log;
@@ -783,6 +787,7 @@
 }
 void init_dbug_log(void)
 {  
+#ifdef HAS_LOCALTIME_R 
   time_t skr;
   struct tm tm_tmp;
   struct tm *start;
@@ -790,6 +795,7 @@
   skr=time(NULL);
   localtime_r(&skr,&tm_tmp);
   start=&tm_tmp;
+#endif
 
 #ifdef _UNIX_
   DBUG_PUSH("d:t:S:O,/tmp/myodbc.log");
@@ -800,6 +806,7 @@
   DBUG_PRINT("",("--      %s, VERSION: %s       --",DRIVER_NAME, DRIVER_VERSION));
   DBUG_PRINT("",("--                                                      --"));
   DBUG_PRINT("",("--                    DEBUG LOGGING                     --"));
+#ifdef HAS_LOCALTIME_R
   DBUG_PRINT("",("--                                                      --"));
   DBUG_PRINT("",("--              TIMESTAMP: %02d%02d%02d %2d:%02d:%02d              --", 
                                                                     start->tm_year % 100,
@@ -808,6 +815,7 @@
 	                                                                  start->tm_hour,
 	                                                                  start->tm_min,
 	                                                                  start->tm_sec)); 
+#endif
   DBUG_PRINT("",("----------------------------------------------------------\n\n"));
 }
 const char *dbug_stmt_type(SQLUSMALLINT fOption)

--- 1.22/myodbc3.h	Sun May 26 18:33:55 2002
+++ 1.23/myodbc3.h	Thu May 30 17:22:42 2002
@@ -126,6 +126,9 @@
 #if defined(_WIN32) || defined(WIN32)
 #define INTFUNC  __stdcall
 #define EXPFUNC  __stdcall
+#if !defined(HAVE_LOCALTIME_R)
+#define HAVE_LOCALTIME_R 1
+#endif
 #else
 #define INTFUNC PASCAL
 #define EXPFUNC __export CALLBACK

---------------------------------------------------------------------
Please check "http://www.mysql.com/Manual_chapter/manual_toc.html" before
posting. To request this thread, e-mail myodbc-thread5565@lists.mysql.com

To unsubscribe, send a message to the address shown in the
List-Unsubscribe header of this message. If you cannot see it,
e-mail myodbc-unsubscribe@lists.mysql.com instead.

[prev in list] [next in list] [prev in thread] [next in thread]