Fix for time.lisp's roll function

diff --git a/ChangeLog b/ChangeLog
index 16b1adf166c4e41642b785f25ebdca262be2673d..a741db9a0f25a3894c1ed5c2ef20fb64b41ba8cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+10 Dec 2009  Kevin Rosenberg <kevin@rosenberg.net>
+       * sql/time.lisp: Patch from Oleg Tihonov to roll function
+       to properly use USEC argument.
+

 21 Nov 2009  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 4.1.2
        * Makefiles: On 64-bit Linux systems, try to build both 32 and 64-bit
 21 Nov 2009  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 4.1.2
        * Makefiles: On 64-bit Linux systems, try to build both 32 and 64-bit

diff --git a/db-mysql/Makefile.msvc b/db-mysql/Makefile.msvc
old mode 100644 (file)
new mode 100755 (executable)
index a692f4c..c2767ba
--- a/db-mysql/Makefile.msvc
+++ b/db-mysql/Makefile.msvc
@@ -9,7 +9,7 @@
 #
 #  CVS Id:   $Id: Makefile.msvc,v 1.1 2002/09/18 07:43:40 kevin Exp $
 #
 #
 #  CVS Id:   $Id: Makefile.msvc,v 1.1 2002/09/18 07:43:40 kevin Exp $
 #

-# This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
+# This file, part of CLSQL, is Copyright (c) 2002-2009 by Kevin M. Rosenberg

 #
 # CLSQL users are granted the rights to distribute and use this software
 # as governed by the terms of the Lisp Lesser GNU Public License
 #
 # CLSQL users are granted the rights to distribute and use this software
 # as governed by the terms of the Lisp Lesser GNU Public License


@@ -20,23 +20,23 @@
 BASE=clsql_mysql
 
 # Set to the directory where you have installed mysql's library
 BASE=clsql_mysql
 
 # Set to the directory where you have installed mysql's library

-MYSQL_DIR=c:/mysql
-
-MYSQL_LIB_DIR=$(MYSQL_DIR)/lib/opt
-MYSQL_LIB_FILE=$(MYSQL_LIB_DIR)/Libmysql.lib
-MYSQL_INCLUDE=$(MYSQL_DIR)/include
+MYSQL_DIR=c:/Program Files/MySQL/MySQL Server 5.1/
+MYSQL_LIB_FILE=$(MYSQL_DIR)lib\opt\mysqlclient.lib
+MYSQL_INCLUDE=$(MYSQL_DIR)include

 
 # Nothing to configure beyond here
 
 SRC=$(BASE).c
 OBJ=$(BASE).obj
 DLL=$(BASE).dll
 
 # Nothing to configure beyond here
 
 SRC=$(BASE).c
 OBJ=$(BASE).obj
 DLL=$(BASE).dll

+LIB=$(BASE).lib
+

 
 $(DLL): $(SRC) $(MYSQL_LIB_FILE)
 
 $(DLL): $(SRC) $(MYSQL_LIB_FILE)

-       cl /MD /LD -D_MT /DWIN32=1 /D__LCC__=1 /I$(MYSQL_INCLUDE) $(SRC) $(MYSQL_LIB_FILE)
+       echo "LD"
+       echo $(MYSQL_LIB_FILE)
+       cl /MD /LD -D_MT /DWIN32=1 /D__LCC__=1 /I"$(MYSQL_INCLUDE)" $(SRC) $(MYSQL_LIB_FILE)

         del $(OBJ) $(BASE).exp
 
 clean:
         del /q $(DLL)
         del $(OBJ) $(BASE).exp
 
 clean:
         del /q $(DLL)

-
-

diff --git a/db-mysql/clsql_mysql.lib b/db-mysql/clsql_mysql.lib
deleted file mode 100644 (file)
index 0a2a75b..0000000
Binary files a/db-mysql/clsql_mysql.lib and /dev/null differ

diff --git a/sql/time.lisp b/sql/time.lisp
index 7024fe31c13e4c61010e54f8acec7482cc493ad2..554bc17984fa5c1931706b632eb8eaf8dcb3b079 100644 (file)
--- a/sql/time.lisp
+++ b/sql/time.lisp
@@ -1071,10 +1071,9 @@ with the given options"
              (setf (time-mjd date) (time-mjd new-date))
              (setq date new-date))))))
   (let ((mjd (time-mjd date))
              (setf (time-mjd date) (time-mjd new-date))
              (setq date new-date))))))
   (let ((mjd (time-mjd date))

-        (sec (time-second date))
-        (usec (time-usec date)))
+        (sec (time-second date)))

     (multiple-value-bind (sec-new usec-new)
     (multiple-value-bind (sec-new usec-new)

-        (floor (+ usec
+        (floor (+ usec (time-usec date)

                   (* 1000000
                      (+ sec second
                         (* 60 minute)
                   (* 1000000
                      (+ sec second
                         (* 60 minute)