summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-10-29 20:04:56 +0100
committerAnatol Belski <ab@php.net>2014-10-29 20:04:56 +0100
commitd77ce317636919a87daa7f8ffb2979474f9cade7 (patch)
treec9ebe2c7ad01661e7696a8f15d6d4842870f03ea /ext/mysql/php_mysql.c
parent23f089a6b3586d524e8709d75262029bc8fa7ad4 (diff)
parentfc904569ea5c5513925a69bf43820845eb3db104 (diff)
downloadphp-git-d77ce317636919a87daa7f8ffb2979474f9cade7.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: fix output globals importing export output globals use portable strndup implementation unix sockets aren't available on windows dll export APIs needed by phpdbg fix sapi/phpdbg/config.w32 Don't treat warnings as failures in the junit output
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions