diff options
| author | Remi Collet <remi@php.net> | 2014-02-27 08:49:33 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-02-27 08:49:33 +0100 |
| commit | 82e92c99a66c37f6cd672e3cf291325104221e43 (patch) | |
| tree | 180c21107d2d01847f4b3182fd5b693598cb650d /ext/mysqli/php_mysqli_structs.h | |
| parent | fd20278fa58f77879124783d3207a7fd6e059199 (diff) | |
| parent | 33d372a45fee931a05fda7191e8548639852ca9c (diff) | |
| download | php-git-82e92c99a66c37f6cd672e3cf291325104221e43.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
test for bug #66762
Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index e7c02f9c9b..899c0c97c8 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -116,6 +116,10 @@ typedef struct { BIND_BUFFER param; BIND_BUFFER result; char *query; +#ifndef MYSQLI_USE_MYSQLND + /* used to manage refcount with libmysql (already implement in mysqlnd) */ + zend_object_handle link_handle; +#endif } MY_STMT; typedef struct { |