From 52371a2d15d229cb5c1f2f5fb72411052e43cb9f Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Mon, 8 Feb 2010 13:09:34 +0000 Subject: [PATCH] Fix bug#50416 PROCEDURE db.myproc can't return a result set in the given context --- NEWS | 2 ++ ext/mysql/php_mysql.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index f041d854e3..8e6454429b 100644 --- a/NEWS +++ b/NEWS @@ -57,6 +57,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 #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.) - Fixed bug #49463 (setAttributeNS fails setting default namespace). (Rob) - Fixed bug #48811 (Directives in PATH section do not get applied to diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index c101e7bc14..2c3085fd82 100644 --- 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 -- 2.50.1