From: Andrey Hristov <andrey@php.net>
Date: Mon, 22 Jul 2013 09:02:48 +0000 (+0200)
Subject: Disable a flag
X-Git-Tag: php-5.6.0alpha1~377^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a047ece2e0c8d5e6448986d0e2f8c7c88ec830d7;p=php

Disable a flag
---

diff --git a/NEWS b/NEWS
index 076a0c1819..c679b90a65 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,10 @@ PHP                                                                        NEWS
   . Implemented internal operator overloading
     (RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita)
 
+- mysqlnd:
+  . Disabled flag for SP OUT variables for 5.5+ servers as they are not natively
+    supported by the overlying APIs. (Andrey)
+
 - OPcache:
   . Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
     (Laruence, Dmitry)
diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h
index 4ace69adcf..c9127ef93c 100644
--- a/ext/mysqlnd/mysqlnd_enum_n_def.h
+++ b/ext/mysqlnd/mysqlnd_enum_n_def.h
@@ -104,7 +104,7 @@
 
 #define MYSQLND_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | \
 				CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION | \
-				CLIENT_MULTI_RESULTS | CLIENT_PS_MULTI_RESULTS | CLIENT_LOCAL_FILES | CLIENT_PLUGIN_AUTH)
+				CLIENT_MULTI_RESULTS  | CLIENT_LOCAL_FILES | CLIENT_PLUGIN_AUTH)
 
 #define MYSQLND_NET_FLAG_USE_COMPRESSION 1