merged ChangeLog

diff --git a/ChangeLog b/ChangeLog
index fc146317369149311b37e41a10f8e9b2b487770f..61d09c15df90cc8b0973b9ad64b822addc81b6ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -149,6 +149,9 @@
          * updated the docs to use text instead of longchar since text is
          a more standard db-type (pg,my,and ms all use text)
 
+2013-11-23 Kiss Kalman <kami@zalaszam.hu>
+       * utils/sql.lisp: Commit patch adding ccl getenv support
+
 2013-04-17 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 6.4.1
        * sql/utils.lisp: Patch from Ben Hyde to add weak hash table

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 3616e9b6b28a9b7b72d974ca8307968ecd3dac21..bbe489a1129e090126d86b41caaa0d23943457c7 100644 (file)
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -26,7 +26,7 @@ dylib=$(base).dylib
 .PHONY: all
 all: $(shared_lib)
 
-CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include
+CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql55/mysql -I /usr/local/mysql/include
 LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/opt/local/lib/mysql5/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc
 
 CFLAGS32=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include -m32

diff --git a/sql/utils.lisp b/sql/utils.lisp
index a215a446ed31cc903584ffc37cf1b18f275ad073..be1396e021af6636032140a445781297b6ab3d21 100644 (file)
--- a/sql/utils.lisp
+++ b/sql/utils.lisp
@@ -375,7 +375,7 @@ list of characters and replacement strings."
   (cdr (assoc (string var) ext:*environment-list* :test #'equalp
               :key #'string))
   #+lispworks (lw:environment-variable (string var))
-  #+mcl (ccl::getenv var)
+  #+ccl (ccl::getenv var)
   #+sbcl (sb-ext:posix-getenv var))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)