diff options
author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:48:22 +0300 |
---|---|---|
committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:48:22 +0300 |
commit | be2128c8050fd8d22604acb0e225891551c81c8c (patch) | |
tree | a762e220562999130449272443fe9cde49ce9957 /ext/mysqlnd/mysqlnd_result.c | |
parent | 6279246d2c60437c583f9c273075579bf17be654 (diff) | |
parent | 3f42f2f5d1c8026b6e1d21b91857a08d918c28c8 (diff) | |
download | php-git-be2128c8050fd8d22604acb0e225891551c81c8c.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
typofixes
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result.c')
-rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index fbf8ea031c..245d2f6ef1 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -1151,7 +1151,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c No need to FREE_ALLOCA as we can reuse the 'lengths' and 'fields' arrays. For lengths its absolutely safe. 'fields' is reused because the ownership of the strings has been - transfered above. + transferred above. */ } /* Overflow ? */ |