From bc2cab0f8a51d4dd0f0b3af1f33ee6f734164a32 Mon Sep 17 00:00:00 2001
From: Kevin Rosenberg <kevin@rosenberg.net>
Date: Tue, 16 Feb 2010 09:07:32 -0700
Subject: [PATCH] MySQL options parameter fix and documentation *
 db-mysql/mysql-api.lisp: Fix mysql_options UFFI parameter list *
 doc/ref-connect.xml: Document the MySQL options parameter as   part of the
 connection-spec.

---
 ChangeLog               |  5 +++++
 db-mysql/mysql-api.lisp |  2 +-
 doc/ref-connect.xml     | 10 ++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed7a0a9..7edc1b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-16  Kevin Rosenberg <kevin@rosenberg.net>
+	* db-mysql/mysql-api.lisp: Fix mysql_options UFFI parameter list
+	* doc/ref-connect.xml: Document the MySQL options parameter as
+	part of	the connection-spec.
+	
 2010-02-15  Kevin Rosenberg <kevin@rosenberg.net>
 	* db-mysql/mysql-{api,sql}.lisp: Support sending options
 	to MySQL using mysql_options, which occurs between the API calls
diff --git a/db-mysql/mysql-api.lisp b/db-mysql/mysql-api.lisp
index 60b5cbe..089c812 100644
--- a/db-mysql/mysql-api.lisp
+++ b/db-mysql/mysql-api.lisp
@@ -286,7 +286,7 @@
 (uffi:def-function "mysql_options"
   ((mysql mysql-mysql)
    (option mysql-option)
-   (arg (* :void)))
+   (arg :pointer-void))
   :module "mysql"
   :returning :int)
 
diff --git a/doc/ref-connect.xml b/doc/ref-connect.xml
index d9c992e..a30aaf1 100644
--- a/doc/ref-connect.xml
+++ b/doc/ref-connect.xml
@@ -379,8 +379,14 @@
         <varlistentry>
           <term><parameter>connection-spec</parameter></term>
           <listitem>
-            <para>A vendor specific connection specification supplied
-            as a list or as a string.</para>
+            <para>A SQL backend specific connection specification
+            supplied as a list or as a string.</para>
+            <para>For the MySQL backend, this list includes an
+            optional associative list of connection options. The
+            options list is parsed and supplied to the MySQL API
+            using <function>mysql_options</function> in between the
+            calls to <function>mysql_init</function>
+            and <function>mysql_real_connect</function>.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
-- 
2.34.1