diff options
| author | Christopher Jones <sixd@php.net> | 2014-02-24 16:35:08 -0800 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2014-02-24 16:35:08 -0800 |
| commit | 593505f2668cf649efaf67b646793ff3924e87ca (patch) | |
| tree | 7b64fb3f7373cf886637b7b586ebddb1797e2bd9 /ext/mysql/php_mysql.c | |
| parent | bca0e5edd5b80990b36e611da59ee32b6a0a0161 (diff) | |
| parent | 8cdefd3d101fe6c6ebca742b51204b13ab506842 (diff) | |
| download | php-git-593505f2668cf649efaf67b646793ff3924e87ca.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions