diff options
author | Stanislav Malyshev <stas@php.net> | 2014-11-11 16:32:38 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-11-11 16:32:38 -0800 |
commit | 99b538a72267ba9450c656a3f1475c6ade85a596 (patch) | |
tree | 1369177502bb053a605b3c5f57793c9f1b5f6a05 /ext/mysql/php_mysql.c | |
parent | 791fc70025ce4af80dedc5034d91f5a4972b8231 (diff) | |
parent | 98b22864ff697b84e29c270c187fb316acf8e478 (diff) | |
download | php-git-99b538a72267ba9450c656a3f1475c6ade85a596.tar.gz |
Merge branch 'PHp-5.4' into PHP-5.5
* PHp-5.4:
5.4.36-dev
Fixed bug #66584 Segmentation fault on statement deallocation
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions