andrey Mon, 08 Feb 2010 13:09:34 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294762
Log: Fix bug#50416 PROCEDURE db.myproc can't return a result set in the given context Bug: http://bugs.php.net/50416 (Assigned) PROCEDURE db.myproc can't return a result set in the given context Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c U php/php-src/trunk/ext/mysql/php_mysql.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-02-08 12:31:33 UTC (rev 294761) +++ php/php-src/branches/PHP_5_3/NEWS 2010-02-08 13:09:34 UTC (rev 294762) @@ -57,6 +57,8 @@ - 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 Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-02-08 12:31:33 UTC (rev 294761) +++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-02-08 13:09:34 UTC (rev 294762) @@ -668,6 +668,9 @@ 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 Modified: php/php-src/trunk/ext/mysql/php_mysql.c =================================================================== --- php/php-src/trunk/ext/mysql/php_mysql.c 2010-02-08 12:31:33 UTC (rev 294761) +++ php/php-src/trunk/ext/mysql/php_mysql.c 2010-02-08 13:09:34 UTC (rev 294762) @@ -659,6 +659,9 @@ 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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
