diff options
| author | andrey <andrey@php.net> | 2012-05-02 15:57:08 +0200 |
|---|---|---|
| committer | andrey <andrey@php.net> | 2012-05-02 15:57:08 +0200 |
| commit | 67419499b2869feb0ad91c022da78df7845ab00d (patch) | |
| tree | 379e519ad30d283c4b542316b8448765e669e85d /ext/mysqlnd/mysqlnd_ps.c | |
| parent | e25eea8b838e22692c59cad1279a2e13970d5254 (diff) | |
| parent | b42d000471a1da27626d4fecb538069409ed61fd (diff) | |
| download | php-git-67419499b2869feb0ad91c022da78df7845ab00d.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index f9ff43fe98..90e685654b 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -1622,9 +1622,9 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const s, unsigned i mysqlnd_stmt_separate_one_result_bind(s, param_no TSRMLS_CC); /* Guaranteed is that stmt->result_bind is NULL */ if (!stmt->result_bind) { - stmt->result_bind = mnd_ecalloc(stmt->field_count, sizeof(MYSQLND_RESULT_BIND)); + stmt->result_bind = mnd_pecalloc(stmt->field_count, sizeof(MYSQLND_RESULT_BIND), stmt->persistent); } else { - stmt->result_bind = mnd_erealloc(stmt->result_bind, stmt->field_count * sizeof(MYSQLND_RESULT_BIND)); + stmt->result_bind = mnd_perealloc(stmt->result_bind, stmt->field_count * sizeof(MYSQLND_RESULT_BIND), stmt->persistent); } if (!stmt->result_bind) { DBG_RETURN(FAIL); |