diff options
| author | Remi Collet <remi@php.net> | 2014-02-27 08:50:07 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-02-27 08:50:07 +0100 |
| commit | fa01db3466348004dc6b98696f458851830f6431 (patch) | |
| tree | 65fa67a93dac14c0829108215364b201f676d98b /ext/mysqli/php_mysqli_structs.h | |
| parent | 42a43d45317ac93c2ba934486879a0bc418bc34d (diff) | |
| parent | cb0e6124d4999c3fb64c3aab36dbcd5541e3008a (diff) | |
| download | php-git-fa01db3466348004dc6b98696f458851830f6431.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
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 cc0c8fe63f..0f3eb64d3b 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 { |