[monit-dev] [monit] r306 committed - Mysql protocol test supports mysql 5.5.x and newer now

[monit]

Revision: 306
Author: martin2812
Date: Fri Nov 19 12:48:14 2010
Log: Mysql protocol test supports mysql 5.5.x and newer now


http://code.google.com/p/monit/source/detail?r=306

Modified:
 /trunk/CHANGES.txt
 /trunk/configure.ac
 /trunk/contrib/packages/redhat/monit.spec
 /trunk/protocols/mysql.c

=======================================
--- /trunk/CHANGES.txt  Tue Oct  5 16:52:19 2010
+++ /trunk/CHANGES.txt  Fri Nov 19 12:48:14 2010
@@ -1,4 +1,4 @@
-                     CHANGES version 5.2.2
+                     CHANGES version 5.2.3

            This file summarizes changes made since 5.0

@@ -7,6 +7,12 @@
           https://savannah.nongnu.org/bugs/?group=monit


+Version 5.2.3
+
+BUGFIXES:
+
+* Mysql protocol test supports mysql 5.5.x and newer now.
+
 Version 5.2.2

 BUGFIXES:
=======================================
--- /trunk/configure.ac Fri Oct  1 07:33:57 2010
+++ /trunk/configure.ac Fri Nov 19 12:48:14 2010
@@ -10,7 +10,7 @@
 # Note: in  case of beta subversion, use underscore "_" rather then  
dash "-"
 # since RPM doesn't allow dash in Version
 # Example: 5.0_beta2
-AC_INIT([monit], [5.2.2], address@hidden)
+AC_INIT([monit], [5.2.3], address@hidden)

 # Package info
 AC_REVISION([$Revision: 1.194 $])
=======================================
--- /trunk/contrib/packages/redhat/monit.spec   Sun Nov  7 05:06:33 2010
+++ /trunk/contrib/packages/redhat/monit.spec   Fri Nov 19 12:48:14 2010
@@ -1,6 +1,6 @@
 Name: monit
 Summary: Process monitor and restart utility
-Version: 5.2.2
+Version: 5.2.3
 Release: 1
 Source: http://www.mmonit.com/monit/dist/%{name}-%{version}.tar.gz
 Group: Utilities/Console
=======================================
--- /trunk/protocols/mysql.c    Fri Jan  8 03:20:43 2010
+++ /trunk/protocols/mysql.c    Fri Nov 19 12:48:14 2010
@@ -136,9 +136,8 @@
   }

   /* Compare Response Code: */
-
-  /* If OK, we are loged in and will perform MySQL ping */
   if(buf[4] == 0x00) {
+    /* If OK, we are loged in and will perform MySQL ping */
     if(socket_write(s, (unsigned char *)requestPing, sizeof(requestPing))  
< 0) {
       LogError("MYSQL: error sending ping -- %s\n", STRERROR);
       return FALSE;
@@ -161,13 +160,12 @@
     }

     return TRUE;
-  }
-  /* If Authentication Failed, return success immediately */
-  else if((buf[4] == 0xFF) && (buf[5] == 0x15 && buf[6] == 0x04)) {
+  } else if((buf[4] == 0xFF) && ((buf[5] == 0x15 && buf[6] == 0x04) ||  
(buf[5] == 0xE3 && buf[6] == 0x04))) {
+    /* If access denied (1045) or server requires newer authentication  
protocol (1251), return success immediately */
     return TRUE;
   }

-  LogError("MYSQL: login failed\n");
+  LogError("MYSQL: login failed (error code 0x%x%x)\n", buf[5], buf[6]);

   return FALSE;
 }