Fixed bug #45120 (PDOStatement->execute() returns true then false for same statement).

diff --git a/NEWS b/NEWS
index 06ac7d3841cdaf74955d191207335c06ee236704..49d1321c003180072f4750f6381fbef164970611 100644 (file)
--- 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 69cc7439c58bd953b3b269bc0827671c03a1936e..0277fe5cacec3cb8f0797364441738e326559404 100755 (executable)
--- 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 0e46d5eafdc4dbc5f9322b5ce205bf4fa9fe4e55..db5da823f758770681721f048b5c62504d4ae4a1 100644 (file)
--- 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