summaryrefslogtreecommitdiff
path: root/ext/mysqlnd
diff options
context:
space:
mode:
authorandrey <andrey@php.net>2012-05-16 14:28:55 +0200
committerandrey <andrey@php.net>2012-05-16 14:28:55 +0200
commitd4afbd487abbe9e5f3e4fc6c44974639e123406a (patch)
treea019fa1f4b30869616551d194a273320b4b23369 /ext/mysqlnd
parent93c91c733cf2259263e4d8c0f3ccc254246d404d (diff)
downloadphp-git-d4afbd487abbe9e5f3e4fc6c44974639e123406a.tar.gz
Fix for bug#62046
Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to mysqli_stmt_reset(). Stmt's state was changed to STMT_PREPARED and leads the driver to think that the stmt was just prepared. Because result set exist also for only prepared but not executed sets, the check for stmt->result isn't any good. There is a result set, because as response for COM_PREPARE the server sends metadata and metadata is part of a result set. After COM_EXECUTE the server sends metadata again, which could be different and in this case more correct.
Diffstat (limited to 'ext/mysqlnd')
-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);