mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-30 20:23:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3

Browse Source 
* 'PHP-5.3' of git.php.net:/php-src:
  Fix for bug#62046
This commit is contained in:
Johannes Schlüter 2012-05-16 16:46:08 +02:00
commit 67039363cd
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ext/mysqli/tests/bug62046.phpt Normal file
View File

@ -0,0 +1,40 @@
--TEST--
Bug #62046 mysqli@mysqlnd can't iterate over stored sets after call to mysqli_stmt_reset()
--SKIPIF--
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
require_once("connect.inc");
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
}
if (FALSE === ($stmt = $link->prepare('SELECT 42'))) {
printf("[002] Prepare failed, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
}
if (FALSE === $stmt->execute()) {
printf("[003] Execute failed, [%d] %s\n", $stmt->errorno, $stmt->error);
}
if (FALSE === $stmt->store_result()) {
printf("[004] store_result failed, [%d] %s\n", $stmt->errorno, $stmt->error);
}
$one = NULL;
if (FALSE === $stmt->bind_result($one)) {
printf("[005] bind_result failed, [%d] %s\n", $stmt->errorno, $stmt->error);
}
if (FALSE === $stmt->reset()) {
printf("[006] bind_result failed, [%d] %s\n", $stmt->errorno, $stmt->error);
}
while ($stmt->fetch()) {
var_dump($one);
}
$stmt->close();
$link->close();
echo "done!";
?>
--EXPECT--
int(42)
done!

2
ext/mysqlnd/mysqlnd_ps.c
View File

@ -1265,8 +1265,6 @@ MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const s TSRMLS_DC)
stmt->error_info = conn->error_info; stmt->error_info = conn->error_info;
} }
stmt->upsert_status = conn->upsert_status; stmt->upsert_status = conn->upsert_status;
stmt->state = MYSQLND_STMT_PREPARED;
} }
DBG_INF(ret == PASS? "PASS":"FAIL"); DBG_INF(ret == PASS? "PASS":"FAIL");
DBG_RETURN(ret); DBG_RETURN(ret);