PHP mysqlnd svn commit: r366 - in branches: qcache/mysqlnd threaded_fetch/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-05-21 15:11:16 +0200 (Mon, 21 May 2007)
New Revision: 366

Modified:
   branches/qcache/mysqlnd/mysqlnd.c
   branches/threaded_fetch/mysqlnd/mysqlnd.c
Log:
Merge from trunk


Modified: branches/qcache/mysqlnd/mysqlnd.c
===================================================================
--- branches/qcache/mysqlnd/mysqlnd.c	2007-05-21 13:09:17 UTC (rev 365)
+++ branches/qcache/mysqlnd/mysqlnd.c	2007-05-21 13:11:16 UTC (rev 366)
@@ -2542,7 +2542,9 @@
 		  bug#25371 mysql_change_user() triggers "packets out of sync"
 		  When it gets fixed, there should be one more check here
 		*/
-		if (mysqlnd_get_server_version(conn) > 50113L) {
+		if (mysqlnd_get_server_version(conn) > 50113L &&
+			mysqlnd_get_server_version(conn) < 50118L)
+		{
 			php_mysql_packet_ok redundant_error_packet;
 			PACKET_INIT_ALLOCA(redundant_error_packet, PROT_OK_PACKET);
 			PACKET_READ_ALLOCA(redundant_error_packet, conn);

Modified: branches/threaded_fetch/mysqlnd/mysqlnd.c
===================================================================
--- branches/threaded_fetch/mysqlnd/mysqlnd.c	2007-05-21 13:09:17 UTC (rev 365)
+++ branches/threaded_fetch/mysqlnd/mysqlnd.c	2007-05-21 13:11:16 UTC (rev 366)
@@ -2508,7 +2508,9 @@
 		  bug#25371 mysql_change_user() triggers "packets out of sync"
 		  When it gets fixed, there should be one more check here
 		*/
-		if (mysqlnd_get_server_version(conn) > 50113L) {
+		if (mysqlnd_get_server_version(conn) > 50113L &&
+			mysqlnd_get_server_version(conn) < 50118L)
+		{
 			php_mysql_packet_ok redundant_error_packet;
 			PACKET_INIT_ALLOCA(redundant_error_packet, PROT_OK_PACKET);
 			PACKET_READ_ALLOCA(redundant_error_packet, conn);