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

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 0ab02319b72b17f24912d4806e15238875cb7e0c..8093deb55339a24a6ed43e66713de425a9268ea2 100755 (executable)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -496,6 +496,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