mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4' into PHP-8.0

Browse Source 
* PHP-7.4:
  Fixed bug #63185
This commit is contained in:
Nikita Popov 2020-12-08 11:35:27 +01:00
commit bd72e4aa44
3 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -38,6 +38,8 @@ PHP NEWS
- PDO MySQL:
. Fixed bug #80458 (PDOStatement::fetchAll() throws for upsert queries).
(Kamil Tekiela)
. Fixed bug #63185 (nextRowset() ignores MySQL errors with native prepared
statements). (Nikita)
- Phar:
. Fixed bug #73809 (Phar Zip parse crash - mmap fail). (cmb)

1
ext/pdo_mysql/mysql_statement.c
View File

@ -355,6 +355,7 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt) /* {{{ */
PDO_DBG_RETURN(0);
}
if (mysqlnd_stmt_next_result(S->stmt)) {
pdo_mysql_error_stmt(stmt);
PDO_DBG_RETURN(0);
}

67
ext/pdo_mysql/tests/bug63185.phpt Normal file
View File

@ -0,0 +1,67 @@
--TEST--
Bug #63185: nextRowset() ignores MySQL errors with native prepared statements
--SKIPIF--
<?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
MySQLPDOTest::skip();
?>
--FILE--
<?php
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
$pdo = MySQLPDOTest::factory();
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$pdo->exec('DROP PROCEDURE IF EXISTS test_procedure_error_at_second');
$pdo->exec('CREATE PROCEDURE test_procedure_error_at_second ()
BEGIN
SELECT "x" as foo;
SELECT * FROM no_such_table;
END');
$pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
$st = $pdo->query('CALL test_procedure_error_at_second()');
var_dump($st->fetchAll());
try {
var_dump($st->nextRowset());
} catch (PDOException $e) {
echo $e->getMessage(), "\n";
}
unset($st);
$pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
$st = $pdo->query('CALL test_procedure_error_at_second()');
var_dump($st->fetchAll());
try {
var_dump($st->nextRowset());
} catch (PDOException $e) {
echo $e->getMessage(), "\n";
}
var_dump($st->fetchAll());
?>
--EXPECTF--
array(1) {
[0]=>
array(2) {
["foo"]=>
string(1) "x"
[0]=>
string(1) "x"
}
}
SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.no_such_table' doesn't exist
array(1) {
[0]=>
array(2) {
["foo"]=>
string(1) "x"
[0]=>
string(1) "x"
}
}
SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.no_such_table' doesn't exist
array(0) {
}