diff options
| author | Andrey Hristov <andrey@php.net> | 2013-03-13 15:29:40 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-03-13 15:29:40 +0100 |
| commit | 7503a4b4a4d0ffe4140f5afab9cae45aaa691c4a (patch) | |
| tree | 22c836c50ff39e5bbb1e4262fea8046213aa7cb2 /ext/mysqlnd/mysqlnd_ps.c | |
| parent | 28634bf603d312bf066eab0a95700ae187d8d347 (diff) | |
| parent | 0777a18703d9be2ea8efd85c0352863b8768e49e (diff) | |
| download | php-git-7503a4b4a4d0ffe4140f5afab9cae45aaa691c4a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 4916c0650d..2a0c9dd594 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -1463,6 +1463,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_pecalloc(stmt->param_count, sizeof(MYSQLND_PARAM_BIND), stmt->persistent); stmt->param_bind = mnd_ecalloc(stmt->param_count, sizeof(MYSQLND_PARAM_BIND)); if (!stmt->param_bind) { DBG_RETURN(FAIL); |