summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierrick Charron <pierrick@php.net>2009-12-03 15:24:43 +0000
committerPierrick Charron <pierrick@php.net>2009-12-03 15:24:43 +0000
commite2efe4bc7b96febe5b7938128ea6b1ce8f605cf3 (patch)
tree0a42c6541af99963042e5e7bfeebd4c1a0e17825
parent7914d298b411dc57a95049fc38698fa6c1785fe5 (diff)
downloadphp-git-e2efe4bc7b96febe5b7938128ea6b1ce8f605cf3.tar.gz
Fixed bug #45120 (PDOStatement->execute() returns true then false for same statement).
-rw-r--r--NEWS2
-rwxr-xr-xext/pdo/pdo_stmt.c1
-rw-r--r--ext/pdo_mysql/tests/bug_45120.phpt2
3 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 06ac7d3841..49d1321c00 100644
--- a/NEWS
+++ b/NEWS
@@ -97,6 +97,8 @@ PHP NEWS
- Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd)
- Fixed bug #49224 (Compile error due to old DNS functions on AIX systems).
(Scott)
+- Fixed bug #45120 (PDOStatement->execute() returns true then false for same
+ statement). (Pierrick)
19 Nov 2009, PHP 5.3.1
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 69cc7439c5..0277fe5cac 100755
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -497,6 +497,7 @@ static PHP_METHOD(PDOStatement, execute)
/* no changes were made */
stmt->active_query_string = stmt->query_string;
stmt->active_query_stringlen = stmt->query_stringlen;
+ ret = 1;
} else if (ret == -1) {
/* something broke */
PDO_HANDLE_STMT_ERR();
diff --git a/ext/pdo_mysql/tests/bug_45120.phpt b/ext/pdo_mysql/tests/bug_45120.phpt
index 0e46d5eafd..db5da823f7 100644
--- a/ext/pdo_mysql/tests/bug_45120.phpt
+++ b/ext/pdo_mysql/tests/bug_45120.phpt
@@ -42,8 +42,6 @@ bug_45120($db);
print "done!";
?>
---XFAIL--
-This is an open PDO bug. It is not a PDO_MYSQL bug
--EXPECT--
Emulated Prepared Statements
Native Prepared Statements