include ../Makefile.common
-base=mysql
+base=uffi_mysql
source=$(base).c
object=$(base).o
-shared_lib=$(base).so
+shared_lib=uffi_mysql.so
.PHONY: all
all: $(shared_lib)
$(shared_lib): $(source) Makefile
- CFLAGS="-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql" LDFLAGS="-L/usr/local/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -lmysqlclient" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh
+ CFLAGS="-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql" LDFLAGS="-L/usr/local/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -lmysqlclient -lz" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh
rm $(object)
.PHONY: distclean
###########################################################################
-BASE=mysql
+BASE=clsql_mysql
# Set to the directory where you have installed mysql's library
MYSQL_DIR=c:/mysql
(in-package #:mysql)
-(defparameter *clsql-mysql-library-path*
- (uffi:find-foreign-library
- '(#+(or 64bit x86-64) "mysql64" "mysql")
- `(,clsql-mysql-system::*library-file-dir*
- "/usr/lib/clsql/"
- "/sw/lib/clsql/")
- :drive-letters '("C")))
+(defparameter *clsql-mysql-library-candidate-names*
+ (list #+(or 64bit x86-64) (make-pathname :name "clsql_mysql64"
+ :directory (pathname-directory *load-truename*))
+ #+(or 64bit x86-64) "clsql_mysql64"
+ (make-pathname :name "clsql_mysql"
+ :directory (pathname-directory *load-truename*))
+ "clsql_mysql"))
(defvar *mysql-library-candidate-names*
- '("libmysqlclient" "libmysql"))
-
-(defparameter *mysql-library-candidate-directories*
- `(,(pathname-directory *load-pathname*)
- #+(or 64bit x86-64) "/usr/lib64/" #+(or 64bit x86-64) "/usr/local/lib64/mysql/"
- "/opt/mysql/lib/mysql/" "/usr/local/lib/"
- "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/" "/opt/local/lib/mysql/"))
-
-(defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))
+ '("libmysqlclient" "libmysql"))
(defvar *mysql-supporting-libraries* '("c")
"Used only by CMU. List of library flags needed to be passed to ld to
*mysql-library-loaded*)
(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
- (let ((mysql-path
- (uffi:find-foreign-library *mysql-library-candidate-names*
- *mysql-library-candidate-directories*
- :drive-letters
- *mysql-library-candidate-drive-letters*)))
- (unless (probe-file mysql-path)
- (error "Can't find mysql client library to load"))
- (uffi:load-foreign-library mysql-path
- :module "mysql"
- :supporting-libraries
- *mysql-supporting-libraries*)
- (uffi:load-foreign-library *clsql-mysql-library-path*
- :module "clsql-mysql"
- :supporting-libraries
- (append *mysql-supporting-libraries*)))
+ (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
+ :module "mysql"
+ :supporting-libraries *mysql-supporting-libraries*)
+ (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
+ :module "clsql-mysql"
+ :supporting-libraries *mysql-supporting-libraries*)
(setq *mysql-library-loaded* t))
+++ /dev/null
-/****************************************************************************
- * FILE IDENTIFICATION
- *
- * Name: clsql-mysql.c
- * Purpose: Helper functions for mysql.cl to handle 64-bit parts of API
- * Programmer: Kevin M. Rosenberg
- * Date Started: Mar 2002
- *
- * $Id$
- *
- * This file, part of CLSQL, is Copyright (c) 2002 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
- * (http://opensource.franz.com/preamble.html), also known as the LLGPL.
- ***************************************************************************/
-
-#ifdef WIN32
-#include <windows.h>
-
-BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, DWORD fdwReason,
- LPVOID lpvReserved)
-{
- return 1;
-}
-
-#define DLLEXPORT __declspec(dllexport)
-
-#else
-#define DLLEXPORT
-#endif
-
-
-#include <mysql.h>
-
-/* Need to assemble a 64-bit integer to send to MySQL */
-DLLEXPORT
-void
-clsql_mysql_data_seek (MYSQL_RES* res, unsigned int offset_high32,
- unsigned int offset_low32)
-{
- my_ulonglong offset;
-
- offset = offset_high32;
- offset = offset << 32;
- offset += offset_low32;
-
- mysql_data_seek (res, offset);
-}
-
-/* The following functions are used to return 64-bit integers to Lisp.
- They return the 32-bit low part and store in upper 32-bits in a
- located sent via a pointer */
-
-static const unsigned int bitmask_32bits = 0xFFFFFFFF;
-#define lower_32bits(int64) ((unsigned int) int64 & bitmask_32bits)
-#define upper_32bits(int64) ((unsigned int) (int64 >> 32))
-
-DLLEXPORT
-unsigned int
-clsql_mysql_num_rows (MYSQL_RES* res, unsigned int* pHigh32)
-{
- my_ulonglong nRows = mysql_num_rows (res);
- *pHigh32 = upper_32bits(nRows);
- return lower_32bits(nRows);
-}
-
-DLLEXPORT
-unsigned int
-clsql_mysql_affected_rows (MYSQL* res, unsigned int* pHigh32)
-{
- my_ulonglong nAffected = mysql_affected_rows (res);
- *pHigh32 = upper_32bits(nAffected);
- return lower_32bits(nAffected);
-}
-
-DLLEXPORT
-unsigned int
-clsql_mysql_insert_id (MYSQL* mysql, unsigned int* pHigh32)
-{
- my_ulonglong insert_id = mysql_insert_id (mysql);
- *pHigh32 = upper_32bits(insert_id);
- return lower_32bits(insert_id);
-}
-
-
-/* Accessor functions to hide the differences across MySQL versions */
-
-DLLEXPORT
-short int
-clsql_mysql_field_type (MYSQL_FIELD* field)
-{
- return field->type;
-}
-
-DLLEXPORT
-char*
-clsql_mysql_field_name (MYSQL_FIELD* field)
-{
- return field->name;
-}
-
-DLLEXPORT
-unsigned long
-clsql_mysql_field_length (MYSQL_FIELD* field)
-{
- return field->length;
-}
-
-DLLEXPORT
-unsigned long
-clsql_mysql_field_max_length (MYSQL_FIELD* field)
-{
- return field->max_length;
-}
-
-
-#if MYSQL_VERSION_ID >= 40102
-#include <stdlib.h>
-
-DLLEXPORT
-MYSQL_BIND*
-allocate_bind (unsigned int n)
-{
- return (MYSQL_BIND*) malloc (n * sizeof(MYSQL_BIND));
-}
-
-DLLEXPORT
-void
-bind_param (MYSQL_BIND bind[], unsigned int n, unsigned long length, unsigned short is_null,
- void* buffer, unsigned short buffer_type, unsigned long buffer_length)
-{
- *bind[n].length = length;
- *bind[n].is_null = is_null;
- bind[n].buffer = buffer;
- bind[n].buffer_type = buffer_type;
- bind[n].buffer_length = buffer_length;
-}
-
-
-DLLEXPORT
-DLLEXPORT
-unsigned int
-clsql_mysql_stmt_affected_rows (MYSQL_STMT* stmt, unsigned int* pHigh32)
-{
- my_ulonglong nAffected = mysql_stmt_affected_rows (stmt);
- *pHigh32 = upper_32bits(nAffected);
- return lower_32bits(nAffected);
-}
-
-
-#endif
-
--- /dev/null
+/****************************************************************************
+ * FILE IDENTIFICATION
+ *
+ * Name: clsql-mysql.c
+ * Purpose: Helper functions for mysql.cl to handle 64-bit parts of API
+ * Programmer: Kevin M. Rosenberg
+ * Date Started: Mar 2002
+ *
+ * $Id$
+ *
+ * This file, part of CLSQL, is Copyright (c) 2002 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
+ * (http://opensource.franz.com/preamble.html), also known as the LLGPL.
+ ***************************************************************************/
+
+#ifdef WIN32
+#include <windows.h>
+
+BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, DWORD fdwReason,
+ LPVOID lpvReserved)
+{
+ return 1;
+}
+
+#define DLLEXPORT __declspec(dllexport)
+
+#else
+#define DLLEXPORT
+#endif
+
+
+#include <mysql.h>
+
+/* Need to assemble a 64-bit integer to send to MySQL */
+DLLEXPORT
+void
+clsql_mysql_data_seek (MYSQL_RES* res, unsigned int offset_high32,
+ unsigned int offset_low32)
+{
+ my_ulonglong offset;
+
+ offset = offset_high32;
+ offset = offset << 32;
+ offset += offset_low32;
+
+ mysql_data_seek (res, offset);
+}
+
+/* The following functions are used to return 64-bit integers to Lisp.
+ They return the 32-bit low part and store in upper 32-bits in a
+ located sent via a pointer */
+
+static const unsigned int bitmask_32bits = 0xFFFFFFFF;
+#define lower_32bits(int64) ((unsigned int) int64 & bitmask_32bits)
+#define upper_32bits(int64) ((unsigned int) (int64 >> 32))
+
+DLLEXPORT
+unsigned int
+clsql_mysql_num_rows (MYSQL_RES* res, unsigned int* pHigh32)
+{
+ my_ulonglong nRows = mysql_num_rows (res);
+ *pHigh32 = upper_32bits(nRows);
+ return lower_32bits(nRows);
+}
+
+DLLEXPORT
+unsigned int
+clsql_mysql_affected_rows (MYSQL* res, unsigned int* pHigh32)
+{
+ my_ulonglong nAffected = mysql_affected_rows (res);
+ *pHigh32 = upper_32bits(nAffected);
+ return lower_32bits(nAffected);
+}
+
+DLLEXPORT
+unsigned int
+clsql_mysql_insert_id (MYSQL* mysql, unsigned int* pHigh32)
+{
+ my_ulonglong insert_id = mysql_insert_id (mysql);
+ *pHigh32 = upper_32bits(insert_id);
+ return lower_32bits(insert_id);
+}
+
+
+/* Accessor functions to hide the differences across MySQL versions */
+
+DLLEXPORT
+short int
+clsql_mysql_field_type (MYSQL_FIELD* field)
+{
+ return field->type;
+}
+
+DLLEXPORT
+char*
+clsql_mysql_field_name (MYSQL_FIELD* field)
+{
+ return field->name;
+}
+
+DLLEXPORT
+unsigned long
+clsql_mysql_field_length (MYSQL_FIELD* field)
+{
+ return field->length;
+}
+
+DLLEXPORT
+unsigned long
+clsql_mysql_field_max_length (MYSQL_FIELD* field)
+{
+ return field->max_length;
+}
+
+
+#if MYSQL_VERSION_ID >= 40102
+#include <stdlib.h>
+
+DLLEXPORT
+MYSQL_BIND*
+allocate_bind (unsigned int n)
+{
+ return (MYSQL_BIND*) malloc (n * sizeof(MYSQL_BIND));
+}
+
+DLLEXPORT
+void
+bind_param (MYSQL_BIND bind[], unsigned int n, unsigned long length, unsigned short is_null,
+ void* buffer, unsigned short buffer_type, unsigned long buffer_length)
+{
+ *bind[n].length = length;
+ *bind[n].is_null = is_null;
+ bind[n].buffer = buffer;
+ bind[n].buffer_type = buffer_type;
+ bind[n].buffer_length = buffer_length;
+}
+
+
+DLLEXPORT
+DLLEXPORT
+unsigned int
+clsql_mysql_stmt_affected_rows (MYSQL_STMT* stmt, unsigned int* pHigh32)
+{
+ my_ulonglong nAffected = mysql_stmt_affected_rows (stmt);
+ *pHigh32 = upper_32bits(nAffected);
+ return lower_32bits(nAffected);
+}
+
+
+#endif
+
projects / clsql.git / commitdiff