summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2012-09-19 17:09:25 -0700
committerChristopher Jones <sixd@php.net>2012-09-19 17:09:25 -0700
commit2141c502ae41c78710f334b36f1c986c1cb6e005 (patch)
tree4ed8b6d44c6233cc080df61d164cb5b9710f80e1 /ext/mysql/php_mysql.c
parent4ec1a2ab04051b2768c7f4829137115dbf164133 (diff)
parentdd6b7ea7bd31ec3253004901285ae0d191974c6e (diff)
downloadphp-git-2141c502ae41c78710f334b36f1c986c1cb6e005.tar.gz
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src: Bug #63000: MCAST_JOIN_GROUP on OSX is broken Fixed bug #61442 (exception threw in __autoload can not be catched)
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions