Merge lp:~brianaker/libdrizzle/api-reworking into lp:libdrizzle

[Brian Aker]

=== modified file 'configure.ac'
--- configure.ac	2013-01-26 23:44:28 +0000
+++ configure.ac	2013-01-27 10:01:22 +0000
@@ -92,6 +92,7 @@
 AC_CHECK_FUNCS([poll])
 AC_CHECK_FUNCS([ppoll])
 
+AX_PTHREAD(, [AC_MSG_ERROR(could not find libpthread)])
 AX_ENDIAN
 AX_HEX_VERSION([LIBDRIZZLE],[$VERSION])
 AX_HARDEN_COMPILER_FLAGS

=== modified file 'libdrizzle-5.1/drizzle.h'
--- libdrizzle-5.1/drizzle.h	2013-01-05 15:46:05 +0000
+++ libdrizzle-5.1/drizzle.h	2013-01-27 10:01:22 +0000
@@ -82,17 +82,6 @@
  */
 
 /**
- * Intialize the Drizzle library
- *
- * Currently only initalizes the SSL library
- */
-DRIZZLE_API
-void drizzle_library_init(void);
-
-DRIZZLE_API
-void drizzle_library_deinit(void);
-
-/**
  * Get library version string.
  *
  * @return Pointer to static buffer in library that holds the version string.

=== modified file 'libdrizzle-5.1/drizzle_client.h'
--- libdrizzle-5.1/drizzle_client.h	2013-01-27 00:09:17 +0000
+++ libdrizzle-5.1/drizzle_client.h	2013-01-27 10:01:22 +0000
@@ -55,7 +55,6 @@
 
 #include <libdrizzle-5.1/drizzle.h>
 #include <libdrizzle-5.1/conn_client.h>
-#include <libdrizzle-5.1/handshake_client.h>
 #include <libdrizzle-5.1/query.h>
 #include <libdrizzle-5.1/result_client.h>
 #include <libdrizzle-5.1/column_client.h>
@@ -94,25 +93,10 @@
  * @return Same return as drizzle_create().
  */
 DRIZZLE_API
-drizzle_st *drizzle_create_tcp(const char *host, in_port_t port,
-                                    const char *user, const char *password,
-                                    const char *db,
-                                    drizzle_options_st *options);
-
-/**
- * Add unix domain socket connection with common arguments.
- *
- * @param[in] uds Path to unix domain socket to use for connection.
- * @param[in] user User to use while establishing the connection.
- * @param[in] password Password to use while establishing the connection.
- * @param[in] db Initial database to connect to.
- * @param[in] options Drizzle connection options to add.
- * @return Same return as drizzle_create().
- */
-DRIZZLE_API
-drizzle_st *drizzle_create_uds(const char *uds, const char *user,
-                                    const char *password, const char *db,
-                                    drizzle_options_st *options);
+  drizzle_st *drizzle_create(const char *host, in_port_t port,
+                             const char *user, const char *password,
+                             const char *db,
+                             drizzle_options_st *options);
 
 /** @} */
 

=== modified file 'libdrizzle-5.1/include.am'
--- libdrizzle-5.1/include.am	2013-01-26 23:44:28 +0000
+++ libdrizzle-5.1/include.am	2013-01-27 10:01:22 +0000
@@ -12,7 +12,6 @@
 nobase_include_HEADERS+= libdrizzle-5.1/drizzle_client.h
 nobase_include_HEADERS+= libdrizzle-5.1/error.h
 nobase_include_HEADERS+= libdrizzle-5.1/field_client.h
-nobase_include_HEADERS+= libdrizzle-5.1/handshake_client.h
 nobase_include_HEADERS+= libdrizzle-5.1/libdrizzle.h
 nobase_include_HEADERS+= libdrizzle-5.1/query.h
 nobase_include_HEADERS+= libdrizzle-5.1/result.h

=== modified file 'libdrizzle/common.h'
--- libdrizzle/common.h	2013-01-13 19:35:23 +0000
+++ libdrizzle/common.h	2013-01-27 10:01:22 +0000
@@ -88,5 +88,6 @@
 #include "libdrizzle/statement_local.h"
 #include "libdrizzle/column.h"
 #include "libdrizzle/binlog.h"
+#include "libdrizzle/handshake_client.h"
 
 #include <memory.h>

=== modified file 'libdrizzle/conn.cc'
--- libdrizzle/conn.cc	2013-01-27 04:54:08 +0000
+++ libdrizzle/conn.cc	2013-01-27 10:01:22 +0000
@@ -113,13 +113,13 @@
     {
       if (fds[0].revents & (POLLIN))
       {
-        drizzle_log_crazy(con, "poll(POLLIN)");
+        drizzle_log_debug(con, "poll(POLLIN)");
         return true;
       }
 
       if (fds[0].revents & (POLLOUT))
       {
-        drizzle_log_crazy(con, "poll(POLLOUT)");
+        drizzle_log_debug(con, "poll(POLLOUT)");
         return true;
       }
 
@@ -155,7 +155,7 @@
     else if (error == 0)
     {
       // "timeout occurred while trying to connect"
-      drizzle_log_crazy(con, "poll(TIMEOUT) %d", con->timeout);
+      drizzle_log_debug(con, "poll(TIMEOUT) %d", con->timeout);
       return false;
     }
 
@@ -699,7 +699,7 @@
 {
   if (con != NULL)
   {
-    drizzle_log_crazy(con, "shutting down the connection");
+    drizzle_log_debug(con, "shutting down the connection");
     con->flags.is_shutdown= true;
     drizzle_return_t ret;
     drizzle_result_st *result;
@@ -945,7 +945,7 @@
         host= tcp->host;
       }
 
-      drizzle_log_crazy(con, "host=%s port=%s", host, port);
+      drizzle_log_debug(con, "host=%s port=%s", host, port);
       int ret= getaddrinfo(host, port, &ai, &(tcp->addrinfo));
       if (ret != 0)
       {
@@ -1074,7 +1074,7 @@
       errno= translate_windows_error();
 #endif /* _WIN32 */
 
-      drizzle_log_crazy(con, "connect return=%d errno=%s", ret, strerror(errno));
+      drizzle_log_debug(con, "connect return=%d errno=%s", ret, strerror(errno));
 
       if (ret == 0)
       {
@@ -1259,7 +1259,7 @@
     errno= translate_windows_error();
 #endif // defined _WIN32 || defined __CYGWIN__
 
-    drizzle_log_crazy(con, "read fd=%d avail= %zd recv=%zd ssl= %d errno=%s",
+    drizzle_log_debug(con, "read fd=%d avail= %zd recv=%zd ssl= %d errno=%s",
                       con->fd, available_buffer, read_size, 
                       (con->ssl_state == DRIZZLE_SSL_STATE_HANDSHAKE_COMPLETE) ? 1 : 0,
                       strerror(errno));
@@ -1319,7 +1319,7 @@
 
       case EINVAL:
         {
-          drizzle_log_crazy(con, "EINVAL fd=%d buffer=%p available_buffer=%zd",
+          drizzle_log_debug(con, "EINVAL fd=%d buffer=%p available_buffer=%zd",
                             con->fd, (char *)con->buffer_ptr + con->buffer_size, available_buffer);
         }
         break;
@@ -1382,7 +1382,7 @@
     errno= translate_windows_error();
 #endif // defined _WIN32 || defined __CYGWIN__
 
-    drizzle_log_crazy(con, "write fd=%d return=%zd ssl=%d errno=%s",
+    drizzle_log_debug(con, "write fd=%d return=%zd ssl=%d errno=%s",
                       con->fd, write_size,
                       (con->ssl_state == DRIZZLE_SSL_STATE_HANDSHAKE_COMPLETE) ? 1 : 0,
                       strerror(errno));

=== modified file 'libdrizzle/drizzle.cc'
--- libdrizzle/drizzle.cc	2013-01-27 05:08:57 +0000
+++ libdrizzle/drizzle.cc	2013-01-27 10:01:22 +0000
@@ -44,6 +44,7 @@
 #include "libdrizzle/common.h"
 
 #include <cerrno>
+#include <pthread.h>
 
 /**
  * @addtogroup drizzle_static Static Drizzle Declarations
@@ -69,28 +70,46 @@
  * Common Definitions
  */
 
-void drizzle_library_init(void)
+static pthread_once_t ssl_startup_once= PTHREAD_ONCE_INIT;
+
+static void drizzle_library_deinit(void)
+{ 
+#if defined(_WIN32)
+  /* if it is MS windows, invoke WSACleanup() at the end*/
+  WSACleanup();
+#endif
+}
+
+static void ssl_startup_function(void)
 {
 #ifdef USE_OPENSSL
   SSL_library_init();
+  ERR_load_crypto_strings();
+  SSL_load_error_strings();
+  OpenSSL_add_all_algorithms();
 #endif
 #if defined(_WIN32)
   /* if it is MS windows, invoke WSAStartup */
   WSADATA wsaData;
   if ( WSAStartup( MAKEWORD(2,2), &wsaData ) != 0 )
   {
-    printf("Error at WSAStartup()\n");
+    fprintf(stderr, "Error at WSAStartup()\n");
   }
 #endif
 
+  (void)atexit(drizzle_library_deinit);
 }
 
-void drizzle_library_deinit(void)
+bool drizzle_library_init(drizzle_st* connection)
 {
-#if defined(_WIN32)
-  /* if it is MS windows, invoke WSACleanup() at the end*/
-  WSACleanup();
-#endif
+  int pthread_error;
+  if ((pthread_error= pthread_once(&ssl_startup_once, ssl_startup_function)) == -1)
+  {
+    drizzle_set_error(connection, "pthread_once", "error:%s", strerror(errno));
+    return false;
+  }
+
+  return true;
 }
 
 const char *drizzle_version(void)
@@ -153,8 +172,7 @@
   con->verbose= verbose;
 }
 
-void drizzle_set_log_fn(drizzle_st *con, drizzle_log_fn *function,
-                            void *context)
+void drizzle_set_log_fn(drizzle_st *con, drizzle_log_fn *function, void *context)
 {
   if (con == NULL)
   {
@@ -165,22 +183,9 @@
   con->log_context= context;
 }
 
-drizzle_st *drizzle_create(void)
-{
-  drizzle_st *con;
-
-  con= new (std::nothrow) drizzle_st;
-  if (con == NULL)
-  {
-    return NULL;
-  }
-
-  return con;
-}
-
 drizzle_st *drizzle_clone(drizzle_st *drizzle, const drizzle_st *from)
 {
-  drizzle= drizzle_create();
+  drizzle= new (std::nothrow) drizzle_st;
   if (drizzle == NULL)
   {
     return NULL;
@@ -271,11 +276,11 @@
   int ret;
   while (1)
   {
-    drizzle_log_crazy(con, "poll timeout=%d", con->timeout);
+    drizzle_log_debug(con, "poll timeout=%d", con->timeout);
 
     ret= poll(con->pfds, 1, con->timeout);
 
-    drizzle_log_crazy(con, "poll return=%d errno=%d", ret, errno);
+    drizzle_log_debug(con, "poll return=%d errno=%d", ret, errno);
 
     if (ret == -1)
     {
@@ -319,41 +324,31 @@
  * Client Definitions
  */
 
-drizzle_st *drizzle_create_tcp(const char *host, in_port_t port,
-                               const char *user, const char *password,
-                               const char *db,
-                               drizzle_options_st *options)
-{
-  drizzle_st *con= drizzle_create();
-  if (con == NULL)
-  {
-    return NULL;
-  }
-
-  drizzle_set_tcp(con, host, port);
-  drizzle_set_auth(con, user, password);
-  drizzle_set_db(con, db);
-  if (options != NULL)
-  {
-    con->options= *options;
-  }
-
-  return con;
-}
-
-drizzle_st *drizzle_create_uds(const char *uds, const char *user,
-                                    const char *password, const char *db,
-                                    drizzle_options_st *options)
-{
-  drizzle_st *con;
-
-  con= drizzle_create();
-  if (con == NULL)
-  {
-    return NULL;
-  }
-
-  drizzle_set_uds(con, uds);
+drizzle_st *drizzle_create(const char *host, in_port_t port,
+                           const char *user, const char *password,
+                           const char *db,
+                           drizzle_options_st *options)
+{
+  drizzle_st *con= new (std::nothrow) drizzle_st;
+  if (con == NULL)
+  {
+    return NULL;
+  }
+
+  if (drizzle_library_init(con) == false)
+  {
+    delete con;
+    return NULL;
+  }
+
+  if (host and host[0] == '/')
+  {
+    drizzle_set_uds(con, host);
+  }
+  else
+  {
+    drizzle_set_tcp(con, host, port);
+  }
   drizzle_set_auth(con, user, password);
   drizzle_set_db(con, db);
   if (options != NULL)

=== modified file 'libdrizzle/drizzle_local.h'
--- libdrizzle/drizzle_local.h	2013-01-27 01:57:09 +0000
+++ libdrizzle/drizzle_local.h	2013-01-27 10:01:22 +0000
@@ -58,21 +58,7 @@
  * @param[in] function Name of function the error happened in. 
  * @param[in] format Format and variable argument list of message.
  */
-void drizzle_set_error(drizzle_st *con, const char *function,
-                       const char *format, ...);
-
-/**
- * Initialize a connection structure. Always check the return value even if
- * passing in a pre-allocated structure. Some other initialization may have
- * failed.
- *
- * @param[in] drizzle Drizzle structure previously initialized with
- *  drizzle_create() or drizzle_clone().
- * @param[in] con Caller allocated structure, or NULL to allocate one.
- * @return On success, a pointer to the (possibly allocated) structure. On
- *  failure this will be NULL.
- */
-drizzle_st *drizzle_create(void);
+void drizzle_set_error(drizzle_st *con, const char *function, const char *format, ...);
 
 /**
  * Free a connection structure.
@@ -84,6 +70,8 @@
 
 drizzle_st *drizzle_clone(drizzle_st *drizzle, const drizzle_st *from);
 
+bool drizzle_library_init(drizzle_st*);
+
 /**
  * Log a message.
  *
@@ -123,8 +111,7 @@
 /**
  * Log an error message, see drizzle_log() for argument details.
  */
-static inline void drizzle_log_error(drizzle_st *con, const char *format,
-                                     ...)
+static inline void drizzle_log_error(drizzle_st *con, const char *format, ...)
 {
   va_list args;
 
@@ -139,8 +126,7 @@
 /**
  * Log an info message, see drizzle_log() for argument details.
  */
-static inline void drizzle_log_info(drizzle_st *con, const char *format,
-                                    ...)
+static inline void drizzle_log_info(drizzle_st *con, const char *format, ...)
 {
   va_list args;
 
@@ -155,24 +141,7 @@
 /**
  * Log a debug message, see drizzle_log() for argument details.
  */
-static inline void drizzle_log_debug(drizzle_st *con, const char *format,
-                                     ...)
-{
-  va_list args;
-
-  if (con->verbose >= DRIZZLE_VERBOSE_DEBUG)
-  {
-    va_start(args, format);
-    drizzle_log(con, DRIZZLE_VERBOSE_DEBUG, format, args);
-    va_end(args);
-  }
-}
-
-/**
- * Log a crazy message, see drizzle_log() for argument details.
- */
-static inline void drizzle_log_crazy(drizzle_st *con, const char *format,
-                                     ...)
+static inline void drizzle_log_debug(drizzle_st *con, const char *format, ...)
 {
   va_list args;
 

=== renamed file 'libdrizzle-5.1/handshake_client.h' => 'libdrizzle/handshake_client.h'
--- libdrizzle-5.1/handshake_client.h	2012-12-22 08:54:15 +0000
+++ libdrizzle/handshake_client.h	2013-01-27 10:01:22 +0000
@@ -62,7 +62,6 @@
  *  drizzle_create(), drizzle_clone(), or related functions.
  * @return Standard drizzle return value.
  */
-DRIZZLE_API
 drizzle_return_t drizzle_handshake_server_read(drizzle_st *con);
 
 /**
@@ -72,7 +71,6 @@
  *  drizzle_create(), drizzle_clone(), or related functions.
  * @return Standard drizzle return value.
  */
-DRIZZLE_API
 drizzle_return_t drizzle_handshake_client_write(drizzle_st *con);
 
 /**
@@ -82,10 +80,8 @@
  *  drizzle_create(), drizzle_clone(), or related functions.
  * @return Standard drizzle return value.
  */
-DRIZZLE_API
 drizzle_return_t drizzle_handshake_ssl_client_write(drizzle_st *con);
 
-DRIZZLE_API
 int drizzle_compile_capabilities(drizzle_st *con);
 
 /** @} */

=== modified file 'libdrizzle/include.am'
--- libdrizzle/include.am	2013-01-27 04:16:09 +0000
+++ libdrizzle/include.am	2013-01-27 10:01:22 +0000
@@ -8,6 +8,7 @@
 noinst_HEADERS+= libdrizzle/conn_local.h
 noinst_HEADERS+= libdrizzle/datetime.h
 noinst_HEADERS+= libdrizzle/drizzle_local.h
+noinst_HEADERS+= libdrizzle/handshake_client.h
 noinst_HEADERS+= libdrizzle/pack.h
 noinst_HEADERS+= libdrizzle/packet.h
 noinst_HEADERS+= libdrizzle/poll.h
@@ -29,6 +30,10 @@
 libdrizzle_libdrizzle_la_LDFLAGS+= @OPENSSL_LDFLAGS@
 libdrizzle_libdrizzle_la_LIBADD+= @OPENSSL_LIBS@
 
+libdrizzle_libdrizzle_la_CFLAGS+= @PTHREAD_CFLAGS@
+libdrizzle_libdrizzle_la_CXXFLAGS+= @PTHREAD_CFLAGS@
+libdrizzle_libdrizzle_la_LIBADD+= @PTHREAD_LIBS@
+
 libdrizzle_libdrizzle_la_CFLAGS+= @ZLIB_CFLAGS@
 libdrizzle_libdrizzle_la_CXXFLAGS+= @ZLIB_CFLAGS@
 libdrizzle_libdrizzle_la_LDFLAGS+= @ZLIB_LDFLAGS@

=== modified file 'libdrizzle/statement.cc'
--- libdrizzle/statement.cc	2013-01-27 00:42:59 +0000
+++ libdrizzle/statement.cc	2013-01-27 10:01:22 +0000
@@ -2,7 +2,7 @@
  *
  * Drizzle Client & Protocol Library
  *
- * Copyright (C) 2012 Drizzle Developer Group
+ * Copyright (C) 2012-2013 Drizzle Developer Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== added file 'm4/ax_pthread.m4'
--- m4/ax_pthread.m4	1970-01-01 00:00:00 +0000
+++ m4/ax_pthread.m4	2013-01-27 10:01:22 +0000
@@ -0,0 +1,313 @@
+# ===========================================================================
+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also link it with them as well. e.g. you should link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threads programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <[e-mail]>
+#   Copyright (c) 2011 Daniel Richard G. <[e-mail]>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 19
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
+        AC_MSG_RESULT($ax_pthread_ok)
+        if test x"$ax_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case ${host_os} in
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin12*)
+        ax_pthread_flags="$ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
+        ;;
+esac
+
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do
+
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
+                if test x"$ax_pthread_config" = xno; then continue; fi
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+                [ax_pthread_ok=yes],
+                [])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT($ax_pthread_ok)
+        if test "x$ax_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_MSG_CHECKING([for joinable pthread attribute])
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                           [int attr = $attr; return attr /* ; */])],
+                [attr_name=$attr; break],
+                [])
+        done
+        AC_MSG_RESULT($attr_name)
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi
+
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case ${host_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
+        esac
+        AC_MSG_RESULT(${flag})
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            ax_cv_PTHREAD_PRIO_INHERIT, [
+                AC_LINK_IFELSE([
+                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
+            AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # More AIX lossage: must compile with xlc_r or cc_r
+        if test x"$GCC" != xyes; then
+          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
+        else
+          PTHREAD_CC=$CC
+        fi
+else
+        PTHREAD_CC="$CC"
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_pthread_ok" = xyes; then
+        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD

=== modified file 'rpm/spec.in'
--- rpm/spec.in	2013-01-27 00:42:59 +0000
+++ rpm/spec.in	2013-01-27 10:01:22 +0000
@@ -69,7 +69,6 @@
 %{_includedir}/libdrizzle-5.1/drizzle_client.h
 %{_includedir}/libdrizzle-5.1/error.h
 %{_includedir}/libdrizzle-5.1/field_client.h
-%{_includedir}/libdrizzle-5.1/handshake_client.h
 %{_includedir}/libdrizzle-5.1/libdrizzle.h
 %{_includedir}/libdrizzle-5.1/query.h
 %{_includedir}/libdrizzle-5.1/result.h

=== modified file 'tests/unit/binlog.cc'
--- tests/unit/binlog.cc	2013-01-27 05:08:57 +0000
+++ tests/unit/binlog.cc	2013-01-27 10:01:22 +0000
@@ -73,11 +73,11 @@
   (void) argv;
   drizzle_binlog_st *binlog;
 
-  con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                          getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                          getenv("MYSQL_USER"),
-                          getenv("MYSQL_PASSWORD"),
-                          getenv("MYSQL_SCHEMA"), NULL);
+  con= drizzle_create(getenv("MYSQL_SERVER"),
+                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                      getenv("MYSQL_USER"),
+                      getenv("MYSQL_PASSWORD"),
+                      getenv("MYSQL_SCHEMA"), NULL);
 
   CLOSE_ON_EXIT(con);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");

=== modified file 'tests/unit/column.c'
--- tests/unit/column.c	2013-01-26 23:44:28 +0000
+++ tests/unit/column.c	2013-01-27 10:01:22 +0000
@@ -51,11 +51,11 @@
   drizzle_row_t row;
   int num_fields;
 
-  con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                          getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                          getenv("MYSQL_USER"),
-                          getenv("MYSQL_PASSWORD"),
-                          getenv("MYSQL_SCHEMA"), 0);
+  con= drizzle_create(getenv("MYSQL_SERVER"),
+                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                      getenv("MYSQL_USER"),
+                      getenv("MYSQL_PASSWORD"),
+                      getenv("MYSQL_SCHEMA"), 0);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
   CLOSE_ON_EXIT(con);
 

=== modified file 'tests/unit/connect.c'
--- tests/unit/connect.c	2013-01-27 06:00:56 +0000
+++ tests/unit/connect.c	2013-01-27 10:01:22 +0000
@@ -47,11 +47,11 @@
   (void) argc;
   (void) argv;
 
-  drizzle_st *con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                                      getenv("MYSQL_USER"),
-                                      getenv("MYSQL_PASSWORD"),
-                                      getenv("MYSQL_SCHEMA"), 0);
+  drizzle_st *con= drizzle_create(getenv("MYSQL_SERVER"),
+                                  getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                                  getenv("MYSQL_USER"),
+                                  getenv("MYSQL_PASSWORD"),
+                                  getenv("MYSQL_SCHEMA"), 0);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
 
   drizzle_return_t ret= drizzle_connect(con);

=== modified file 'tests/unit/connect_uds.c'
--- tests/unit/connect_uds.c	2013-01-12 14:14:18 +0000
+++ tests/unit/connect_uds.c	2013-01-27 10:01:22 +0000
@@ -47,10 +47,11 @@
   (void) argc;
   (void) argv;
 
-  drizzle_st *con= drizzle_create_uds(getenv("MYSQL_SOCK"),
-                                      getenv("MYSQL_USER"),
-                                      getenv("MYSQL_PASSWORD"),
-                                      getenv("MYSQL_SCHEMA"), 0);
+  drizzle_st *con= drizzle_create(getenv("MYSQL_SOCK"),
+                                  0,
+                                  getenv("MYSQL_USER"),
+                                  getenv("MYSQL_PASSWORD"),
+                                  getenv("MYSQL_SCHEMA"), 0);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
 
   drizzle_return_t ret= drizzle_connect(con);

=== modified file 'tests/unit/insert_id.c'
--- tests/unit/insert_id.c	2013-01-12 13:40:18 +0000
+++ tests/unit/insert_id.c	2013-01-27 10:01:22 +0000
@@ -48,11 +48,11 @@
   (void) argc;
   (void) argv;
 
-  drizzle_st *con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                                      getenv("MYSQL_USER"),
-                                      getenv("MYSQL_PASSWORD"),
-                                      getenv("MYSQL_SCHEMA"), 0);
+  drizzle_st *con= drizzle_create(getenv("MYSQL_SERVER"),
+                                  getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                                  getenv("MYSQL_USER"),
+                                  getenv("MYSQL_PASSWORD"),
+                                  getenv("MYSQL_SCHEMA"), 0);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
 
   drizzle_return_t ret= drizzle_connect(con);

=== modified file 'tests/unit/query.c'
--- tests/unit/query.c	2013-01-12 13:40:18 +0000
+++ tests/unit/query.c	2013-01-27 10:01:22 +0000
@@ -49,11 +49,11 @@
   drizzle_row_t row;
   int num_fields;
 
-  drizzle_st *con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                                      getenv("MYSQL_USER"),
-                                      getenv("MYSQL_PASSWORD"),
-                                      getenv("MYSQL_SCHEMA"), 0);
+  drizzle_st *con= drizzle_create(getenv("MYSQL_SERVER"),
+                                  getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                                  getenv("MYSQL_USER"),
+                                  getenv("MYSQL_PASSWORD"),
+                                  getenv("MYSQL_SCHEMA"), 0);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
 
   drizzle_return_t ret= drizzle_connect(con);

=== modified file 'tests/unit/row.c'
--- tests/unit/row.c	2013-01-12 13:40:18 +0000
+++ tests/unit/row.c	2013-01-27 10:01:22 +0000
@@ -49,11 +49,11 @@
   drizzle_row_t row;
   int num_fields;
 
-  drizzle_st *con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                                      getenv("MYSQL_USER"),
-                                      getenv("MYSQL_PASSWORD"),
-                                      getenv("MYSQL_SCHEMA"), 0);
+  drizzle_st *con= drizzle_create(getenv("MYSQL_SERVER"),
+                                  getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                                  getenv("MYSQL_USER"),
+                                  getenv("MYSQL_PASSWORD"),
+                                  getenv("MYSQL_SCHEMA"), 0);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
 
   drizzle_return_t ret= drizzle_connect(con);

=== modified file 'tests/unit/statement.c'
--- tests/unit/statement.c	2013-01-27 00:42:59 +0000
+++ tests/unit/statement.c	2013-01-27 10:01:22 +0000
@@ -53,11 +53,11 @@
 
   ASSERT_EQ(UINT64_MAX, drizzle_stmt_row_count(stmt));
 
-  drizzle_st *con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                                      getenv("MYSQL_USER"),
-                                      getenv("MYSQL_PASSWORD"),
-                                      getenv("MYSQL_SCHEMA"), 0);
+  drizzle_st *con= drizzle_create(getenv("MYSQL_SERVER"),
+                                  getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                                  getenv("MYSQL_USER"),
+                                  getenv("MYSQL_PASSWORD"),
+                                  getenv("MYSQL_SCHEMA"), 0);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
 
   drizzle_return_t ret= drizzle_connect(con);

=== modified file 'tests/unit/statement_char.c'
--- tests/unit/statement_char.c	2013-01-27 01:57:09 +0000
+++ tests/unit/statement_char.c	2013-01-27 10:01:22 +0000
@@ -51,11 +51,11 @@
   (void) argv;
   drizzle_stmt_st *stmt;
 
-  drizzle_st *con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                                      getenv("MYSQL_USER"),
-                                      getenv("MYSQL_PASSWORD"),
-                                      getenv("MYSQL_SCHEMA"), 0);
+  drizzle_st *con= drizzle_create(getenv("MYSQL_SERVER"),
+                                  getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                                  getenv("MYSQL_USER"),
+                                  getenv("MYSQL_PASSWORD"),
+                                  getenv("MYSQL_SCHEMA"), 0);
 
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
 

=== modified file 'tests/unit/unbuffered_query.c'
--- tests/unit/unbuffered_query.c	2013-01-12 13:40:18 +0000
+++ tests/unit/unbuffered_query.c	2013-01-27 10:01:22 +0000
@@ -49,11 +49,11 @@
   drizzle_row_t row;
   int num_fields;
 
-  drizzle_st *con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                                      getenv("MYSQL_USER"),
-                                      getenv("MYSQL_PASSWORD"),
-                                      getenv("MYSQL_SCHEMA"), 0);
+  drizzle_st *con= drizzle_create(getenv("MYSQL_SERVER"),
+                                  getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                                  getenv("MYSQL_USER"),
+                                  getenv("MYSQL_PASSWORD"),
+                                  getenv("MYSQL_SCHEMA"), 0);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
 
   drizzle_return_t ret= drizzle_connect(con);