diff options
| author | Andrey Hristov <andrey@php.net> | 2010-02-08 13:09:34 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-02-08 13:09:34 +0000 |
| commit | 52371a2d15d229cb5c1f2f5fb72411052e43cb9f (patch) | |
| tree | 4b91cb0aa0cb1bc9e15605b1a3b2c841c8828bc1 | |
| parent | 658e86b847b843e08c9576b21af31e3f1e316531 (diff) | |
| download | php-git-52371a2d15d229cb5c1f2f5fb72411052e43cb9f.tar.gz | |
Fix bug#50416
PROCEDURE db.myproc can't return a result set in the given context
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 3 |
2 files changed, 5 insertions, 0 deletions
@@ -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 |