diff options
| author | Hartmut Holzgraefe <hholzgra@php.net> | 2007-12-25 18:55:40 +0000 |
|---|---|---|
| committer | Hartmut Holzgraefe <hholzgra@php.net> | 2007-12-25 18:55:40 +0000 |
| commit | edee094851e8764b0116a7938ac1e03f08c41239 (patch) | |
| tree | a5be417d9ab4e8ca54752dd26c70c4ae9ce6b409 | |
| parent | a47bf2d36a5ead1bab28694581349860e51f579e (diff) | |
| download | php-git-edee094851e8764b0116a7938ac1e03f08c41239.tar.gz | |
MFH: Fix for bug #42548 "PROCEDURE xxx can't return a result set"
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 2 | ||||
| -rw-r--r-- | ext/mysqli/tests/bug42548.phpt | 51 |
3 files changed, 54 insertions, 0 deletions
@@ -77,6 +77,7 @@ PHP NEWS - Fixed bug #42657 (ini_get() returns incorrect value when default is NULL). (Jani) - Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran) +- Fixed bug #42548 (mysqli PROCEDURE calls can't return result sets). (hartmut) - Fixed bug #42509 (gmp leaks memory when gmp_init() not used). (Stas) - Fixed bug #42284 (duplicate of #39700). (Lars W) - Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index d857706a4e..258ba8e863 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1621,6 +1621,8 @@ PHP_FUNCTION(mysqli_real_connect) MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_INITIALIZED); + /* set some required options */ + flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */ /* remove some insecure options */ flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via connect parameter */ if (PG(open_basedir) && PG(open_basedir)[0] != '\0') { diff --git a/ext/mysqli/tests/bug42548.phpt b/ext/mysqli/tests/bug42548.phpt new file mode 100644 index 0000000000..a7d5f39ff7 --- /dev/null +++ b/ext/mysqli/tests/bug42548.phpt @@ -0,0 +1,51 @@ +--TEST-- +Bug #42548 PROCEDURE xxx can't return a result set in the given context (works in 5.2.3!!) +--SKIPIF-- +<?php if (!extension_loaded("mysqli")) print "skip"; ?> +--FILE-- +<?php +$mysqli = mysqli_init(); +$mysqli->real_connect('localhost', 'root', '', 'test'); +if (mysqli_connect_errno()) { + printf("Connect failed: %s\n", mysqli_connect_error()); + exit(); +} + +$mysqli->query("DROP PROCEDURE IF EXISTS p1") or die($mysqli->error); +$mysqli->query("CREATE PROCEDURE p1() BEGIN SELECT 23; SELECT 42; END") or die($mysqli->error); + +if ($mysqli->multi_query("CALL p1();")) +{ + do + { + if ($objResult = $mysqli->store_result()) { + while ($row = $objResult->fetch_assoc()) { + print_r($row); + } + $objResult->close(); + if ($mysqli->more_results()) { + print "----- next result -----------\n"; + } + } else { + print "no results found"; + } + } while ($mysqli->more_results() && $mysqli->next_result()); +} else { + print $mysqli->error; +} + +$mysqli->query("DROP PROCEDURE p1") or die($mysqli->error); +$mysqli->close(); +?> +--EXPECT-- +Array +( + [23] => 23 +) +----- next result ----------- +Array +( + [42] => 42 +) +----- next result ----------- +no results found |