diff options
| author | Christopher Jones <sixd@php.net> | 2014-02-24 17:02:16 -0800 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2014-02-24 17:02:16 -0800 |
| commit | a59ec5d1b0346e2dd097bb076d29f09b7edf12a0 (patch) | |
| tree | ea07224b6e54d743dca338838109e10144bc0299 /ext/mysqlnd/mysqlnd_alloc.c | |
| parent | 593505f2668cf649efaf67b646793ff3924e87ca (diff) | |
| parent | ee7671afb5d87b7509b2a815a6b151e3a8a74e76 (diff) | |
| download | php-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/mysqlnd/mysqlnd_alloc.c')
0 files changed, 0 insertions, 0 deletions