Sync from 5_3. Cutting off a few edges:

- use connection parameter from environment variables
 - check if MySQL supports procedures
 - whitespace
This commit is contained in:
Ulf Wendel 2007-12-28 14:51:26 +00:00
parent 9f4a22f1a8
commit 5e64d2273e

View file

@ -1,11 +1,23 @@
--TEST-- --TEST--
Bug #42548 PROCEDURE xxx can't return a result set in the given context (works in 5.2.3!!) Bug #42548 PROCEDURE xxx can't return a result set in the given context (works in 5.2.3!!)
--SKIPIF-- --SKIPIF--
<?php if (!extension_loaded("mysqli")) print "skip"; ?> <?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
}
if (mysqli_get_server_version($link) <= 50000) {
die(sprintf('skip Needs MySQL 5.0+, found version %d.', mysqli_get_server_version($link)));
}
?>
--FILE-- --FILE--
<?php <?php
require_once('connect.inc');
$mysqli = mysqli_init(); $mysqli = mysqli_init();
$mysqli->real_connect('localhost', 'root', '', 'test'); $mysqli->real_connect($host, $user, $passwd, $db, $port, $socket);
if (mysqli_connect_errno()) { if (mysqli_connect_errno()) {
printf("Connect failed: %s\n", mysqli_connect_error()); printf("Connect failed: %s\n", mysqli_connect_error());
exit(); exit();
@ -27,7 +39,7 @@ if ($mysqli->multi_query("CALL p1();"))
print "----- next result -----------\n"; print "----- next result -----------\n";
} }
} else { } else {
print "no results found"; print "no results found\n";
} }
} while ($mysqli->more_results() && $mysqli->next_result()); } while ($mysqli->more_results() && $mysqli->next_result());
} else { } else {
@ -36,6 +48,7 @@ if ($mysqli->multi_query("CALL p1();"))
$mysqli->query("DROP PROCEDURE p1") or die($mysqli->error); $mysqli->query("DROP PROCEDURE p1") or die($mysqli->error);
$mysqli->close(); $mysqli->close();
print "done!";
?> ?>
--EXPECT-- --EXPECT--
Array Array
@ -49,3 +62,4 @@ Array
) )
----- next result ----------- ----- next result -----------
no results found no results found
done!