Upgrade ext/mysql/libmysql to version 3.23.32. One notable bug fix is

that the client can now connect to a server which is using a default
charset other than latin1.

1 files changed, 14 insertions, 15 deletions

diff --git a/ext/mysql/libmysql/net.c b/ext/mysql/libmysql/net.c
index 3326851028..3e15657865 100644
--- a/ext/mysql/libmysql/net.c
+++ b/ext/mysql/libmysql/net.c
@@ -36,7 +36,7 @@ ulong net_buffer_length=8192;	/* Default length. Enlarged if necessary */
 #if !defined(__WIN__) && !defined(MSDOS)
 #include <sys/socket.h>
 #else
-#undef MYSQL_SERVER			// Win32 can't handle interrupts
+#undef MYSQL_SERVER			/* Win32 can't handle interrupts */
 #endif
 #if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__)
 #include <netinet/in_systm.h>
@@ -57,7 +57,7 @@ extern ulong mysqld_net_retry_count;
 typedef my_bool thr_alarm_t;
 typedef my_bool ALARM;
 #define thr_alarm_init(A) (*A)=0
-#define thr_alarm_in_use(A) (A)
+#define thr_alarm_in_use(A) (*(A))
 #define thr_end_alarm(A)
 #define thr_alarm(A,B,C) local_thr_alarm((A),(B),(C))
 static inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __attribute__((unused)))
@@ -114,7 +114,7 @@ int my_net_init(NET *net, Vio* vio)
     if (!(test_flags & TEST_BLOCKING))
       vio_blocking(vio, FALSE);
 #endif
-    vio_fastsend(vio,TRUE);
+    vio_fastsend(vio);
   }
   return 0;
 }
@@ -257,7 +257,7 @@ net_real_write(NET *net,const char *packet,ulong len)
   int length;
   char *pos,*end;
   thr_alarm_t alarmed;
-#if (!defined(__WIN__) && !defined(__EMX__))
+#if !defined(__WIN__) && !defined(__EMX__)
   ALARM alarm_buff;
 #endif
   uint retry_count=0;
@@ -312,11 +312,11 @@ net_real_write(NET *net,const char *packet,ulong len)
   pos=(char*) packet; end=pos+len;
   while (pos != end)
   {
-    if ((int) (length=vio_write(net->vio,pos,(size_t) (end-pos))) <= 0)
+    if ((int) (length=vio_write(net->vio,pos,(int) (end-pos))) <= 0)
     {
       my_bool interrupted = vio_should_retry(net->vio);
 #if (!defined(__WIN__) && !defined(__EMX__))
-      if ((interrupted || length==0) && !thr_alarm_in_use(alarmed))
+      if ((interrupted || length==0) && !thr_alarm_in_use(&alarmed))
       {
         if (!thr_alarm(&alarmed,(uint) net_write_timeout,&alarm_buff))
         {                                       /* Always true for client */
@@ -341,7 +341,7 @@ net_real_write(NET *net,const char *packet,ulong len)
       }
       else
 #endif /* (!defined(__WIN__) && !defined(__EMX__)) */
-	if (thr_alarm_in_use(alarmed) && !thr_got_alarm(alarmed) &&
+	if (thr_alarm_in_use(&alarmed) && !thr_got_alarm(&alarmed) &&
 	    interrupted)
       {
 	if (retry_count++ < RETRY_COUNT)
@@ -375,7 +375,7 @@ net_real_write(NET *net,const char *packet,ulong len)
   if (net->compress)
     my_free((char*) packet,MYF(0));
 #endif
-  if (thr_alarm_in_use(alarmed))
+  if (thr_alarm_in_use(&alarmed))
   {
     thr_end_alarm(&alarmed);
     vio_blocking(net->vio, net_blocking);
@@ -398,14 +398,13 @@ net_real_write(NET *net,const char *packet,ulong len)
 
 static void my_net_skip_rest(NET *net, ulong remain, thr_alarm_t *alarmed)
 {
-  char buff[1024];
   ALARM alarm_buff;
   uint retry_count=0;
-  if (!thr_alarm_in_use(alarmed))
+  if (!thr_alarm_in_use(&alarmed))
   {
     if (!thr_alarm(alarmed,net->timeout,&alarm_buff) ||
 	(!vio_is_blocking(net->vio) && vio_blocking(net->vio,TRUE) < 0))
-      return;					// Can't setup, abort
+      return;					/* Can't setup, abort */
   }
   while (remain > 0)
   {
@@ -413,7 +412,7 @@ static void my_net_skip_rest(NET *net, ulong remain, thr_alarm_t *alarmed)
     if ((int) (length=vio_read(net->vio,(char*) net->buff,remain)) <= 0L)
     {
       my_bool interrupted = vio_should_retry(net->vio);
-      if (!thr_got_alarm(alarmed) && interrupted)
+      if (!thr_got_alarm(&alarmed) && interrupted)
       {					/* Probably in MIT threads */
 	if (retry_count++ < RETRY_COUNT)
 	  continue;
@@ -468,7 +467,7 @@ my_real_read(NET *net, ulong *complen)
 	    an alarm to not 'read forever', change the socket to non blocking
 	    mode and try again
 	  */
-	  if ((interrupted || length == 0) && !thr_alarm_in_use(alarmed))
+	  if ((interrupted || length == 0) && !thr_alarm_in_use(&alarmed))
 	  {
 	    if (!thr_alarm(&alarmed,net->timeout,&alarm_buff)) /* Don't wait too long */
 	    {
@@ -500,7 +499,7 @@ my_real_read(NET *net, ulong *complen)
 	    }
 	  }
 #endif /* (!defined(__WIN__) && !defined(__EMX__)) || defined(MYSQL_SERVER) */
-	  if (thr_alarm_in_use(alarmed) && !thr_got_alarm(alarmed) &&
+	  if (thr_alarm_in_use(&alarmed) && !thr_got_alarm(&alarmed) &&
 	      interrupted)
 	  {					/* Probably in MIT threads */
 	    if (retry_count++ < RETRY_COUNT)
@@ -584,7 +583,7 @@ my_real_read(NET *net, ulong *complen)
     }
 
 end:
-  if (thr_alarm_in_use(alarmed))
+  if (thr_alarm_in_use(&alarmed))
   {
     thr_end_alarm(&alarmed);
     vio_blocking(net->vio, net_blocking);