summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli_api.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2014-02-24 17:02:16 -0800
committerChristopher Jones <sixd@php.net>2014-02-24 17:02:16 -0800
commita59ec5d1b0346e2dd097bb076d29f09b7edf12a0 (patch)
treeea07224b6e54d743dca338838109e10144bc0299 /ext/mysqli/mysqli_api.c
parent593505f2668cf649efaf67b646793ff3924e87ca (diff)
parentee7671afb5d87b7509b2a815a6b151e3a8a74e76 (diff)
downloadphp-git-a59ec5d1b0346e2dd097bb076d29f09b7edf12a0.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
0 files changed, 0 insertions, 0 deletions