From: Andrey Hristov <andrey@php.net>
Date: Mon, 8 Feb 2010 13:09:34 +0000 (+0000)
Subject: Fix bug#50416
X-Git-Tag: php-5.4.0alpha1~191^2~1973
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c826c04dcd5e0f284a754292a1e5da3549a24332;p=php

Fix bug#50416
PROCEDURE db.myproc can't return a result set in the given context
---

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index fe49949b4e..dfa5aa5a3b 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -659,6 +659,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