merge r294762: Fix bug#50416

PROCEDURE db.myproc can't return a result set in the given context (andrey)

diff --git a/NEWS b/NEWS
index 2d8ac68634273a08a8e4127e73b8563b6a97c254..dec4d18255c84a405dd123cc09879427b61fd739 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -51,6 +51,8 @@ PHP                                                                        NEWS
 - Fixed bug #50632 (filter_input() does not return default value if the
   variable does not exist). (Ilia)
 - Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). (Pierrick)
+- Fixed bug #50416 (PROCEDURE db.myproc can't return a result set in the given
+  context). (Andrey)
 - Fixed bug #49585 (date_format buffer not long enough for >4 digit years).
   (Derick, Adam)
 - Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.)

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index c101e7bc14095fa309cd4a8f8ba1408dd9b001e0..2c3085fd82aabf453bd6ab363a47b332489e132c 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -668,6 +668,9 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                        client_flags ^= CLIENT_LOCAL_FILES;
                }
 
+#ifdef CLIENT_MULTI_RESULTS
+               client_flags |= CLIENT_MULTI_RESULTS; /* compatibility with 5.2, see bug#50416 */
+#endif
 #ifdef CLIENT_MULTI_STATEMENTS
                client_flags &= ~CLIENT_MULTI_STATEMENTS;   /* don't allow multi_queries via connect parameter */
 #endif