From da769e6c1d5794442794216e48c6c014e6a3430c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Schl=C3=BCter?= Date: Thu, 11 Feb 2010 17:14:44 +0000 Subject: [PATCH] merge r294762: Fix bug#50416 PROCEDURE db.myproc can't return a result set in the given context (andrey) --- NEWS | 2 ++ ext/mysql/php_mysql.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 2d8ac68634..dec4d18255 100644 --- 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 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