Merge lp:~user-none/mariadb-native-client/mariadb-native-client into lp:mariadb-native-client

[John Schember]

[John Schember (user-none)]

Also, syncs prototype with MySQL 5.5.

Unmerged revisions

38. By John Schember <email address hidden> on 2013-03-07

Allow TCP to be specified via options to force tcp. Otherwise localhost:port does not work properly.

=== modified file 'include/mysql.h'
--- include/mysql.h	2013-01-30 07:37:24 +0000
+++ include/mysql.h	2013-03-07 19:09:25 +0000
@@ -424,7 +424,7 @@
 MYSQL_RES *	STDCALL mysql_store_result(MYSQL *mysql);
 MYSQL_RES *	STDCALL mysql_use_result(MYSQL *mysql);
 int		STDCALL mysql_options(MYSQL *mysql,enum mysql_option option,
-				      const char *arg);
+				      const void *arg);
 void		STDCALL mysql_free_result(MYSQL_RES *result);
 void		STDCALL mysql_data_seek(MYSQL_RES *result,
 					my_ulonglong offset);
 
=== modified file 'libmariadb/libmariadb.c'
--- libmariadb/libmariadb.c	2013-03-07 12:56:14 +0000
+++ libmariadb/libmariadb.c	2013-03-07 19:09:25 +0000
@@ -1500,7 +1500,9 @@
   */
 
 #if defined(HAVE_SYS_UN_H)
-  if ((!host || !strcmp(host,LOCAL_HOST)) && (unix_socket || mysql_unix_port))
+  if ((!host || strcmp(host,LOCAL_HOST) == 0) &&
+      mysql->options.protocol != MYSQL_PROTOCOL_TCP &&
+      (unix_socket || mysql_unix_port))
   {
     host=LOCAL_HOST;
     if (!unix_socket)
@@ -1530,9 +1532,11 @@
 #elif defined(_WIN32)
   {
     if ((unix_socket ||
-	 !host && is_NT() ||
-	 host && !strcmp(host,LOCAL_HOST_NAMEDPIPE) ||
-	 mysql->options.named_pipe || !have_tcpip))
+        (!host && is_NT()) ||
+        (host && strcmp(host,LOCAL_HOST_NAMEDPIPE) == 0) ||
+        mysql->options.named_pipe ||
+        !have_tcpip) &&
+       mysql->options.protocol != MYSQL_PROTOCOL_TCP)
     {
       sock=0;
       if ((hPipe=create_named_pipe(net, mysql->options.connect_timeout,
@@ -2637,7 +2641,7 @@
 
 
 int STDCALL
-mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg)
+mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
 {
   DBUG_ENTER("mysql_option");
   DBUG_PRINT("enter",("option: %d",(int) option));