summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_ps.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2014-03-10 18:19:22 +0200
committerAndrey Hristov <andrey@php.net>2014-03-10 18:19:22 +0200
commit3456d4723540fe320a37e6e4a2fa536c30bd2df9 (patch)
treea007a81f93b7a6b9e636b74efe2237a342491bfd /ext/mysqlnd/mysqlnd_ps.c
parent07738a0f2b2cd394fe87e58e6689db1d81d999f8 (diff)
parent73f03a47d0cd97a3c55a79b897ba55ea1ed2e90e (diff)
downloadphp-git-3456d4723540fe320a37e6e4a2fa536c30bd2df9.tar.gz
Merge branch 'PHP-5.6'
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
-rw-r--r--ext/mysqlnd/mysqlnd_ps.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 3e43f6eae6..b86bc05b53 100644
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -90,6 +90,12 @@ MYSQLND_METHOD(mysqlnd_stmt, store_result)(MYSQLND_STMT * const s TSRMLS_DC)
result->type = MYSQLND_RES_PS_BUF;
/* result->m.row_decoder = php_mysqlnd_rowp_read_binary_protocol; */
+ result->stored_data = mysqlnd_result_buffered_init(result->field_count, TRUE, result->persistent TSRMLS_CC);
+ if (!result->stored_data) {
+ SET_OOM_ERROR(*conn->error_info);
+ DBG_RETURN(NULL);
+ }
+
ret = result->m.store_result_fetch_data(conn, result, result->meta, TRUE TSRMLS_CC);
result->stored_data->m.fetch_row = mysqlnd_stmt_fetch_row_buffered;