diff options
| author | Andrey Hristov <andrey@php.net> | 2013-03-13 14:24:23 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-03-13 14:24:23 +0100 |
| commit | 0777a18703d9be2ea8efd85c0352863b8768e49e (patch) | |
| tree | f8eb0f63a1064597c3f3ddeb6650e60e27332c2a /ext/mysqlnd/mysqlnd_ps.c | |
| parent | a328cc452e02ef9605518a1c1a0c97d91b87b846 (diff) | |
| parent | f1e2edff8befb7863723adbe5680ce3d9714d9ed (diff) | |
| download | php-git-0777a18703d9be2ea8efd85c0352863b8768e49e.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
NEWS
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 99bd021593..cd5b302275 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -1478,7 +1478,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, unsigne if (stmt->param_count) { if (!stmt->param_bind) { - stmt->param_bind = mnd_ecalloc(stmt->param_count, sizeof(MYSQLND_PARAM_BIND)); + stmt->param_bind = mnd_pecalloc(stmt->param_count, sizeof(MYSQLND_PARAM_BIND), stmt->persistent); if (!stmt->param_bind) { DBG_RETURN(FAIL); } |