summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_ps.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-05-16 16:46:08 +0200
committerJohannes Schlüter <johannes@php.net>2012-05-16 16:46:08 +0200
commit67039363cd5f317d77fffb88efcda3ffc6cd5d3f (patch)
tree349180ca077df60f4638a92a06a0d91027bf6a69 /ext/mysqlnd/mysqlnd_ps.c
parent6e519895011ea3ef43ce62c1050e72337af94b79 (diff)
parentd4afbd487abbe9e5f3e4fc6c44974639e123406a (diff)
downloadphp-git-67039363cd5f317d77fffb88efcda3ffc6cd5d3f.tar.gz
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
* 'PHP-5.3' of git.php.net:/php-src: Fix for bug#62046
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
-rw-r--r--ext/mysqlnd/mysqlnd_ps.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 2044390715..d762689a92 100644
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -1265,8 +1265,6 @@ MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const s TSRMLS_DC)
stmt->error_info = conn->error_info;
}
stmt->upsert_status = conn->upsert_status;
-
- stmt->state = MYSQLND_STMT_PREPARED;
}
DBG_INF(ret == PASS? "PASS":"FAIL");
DBG_RETURN(ret);