diff options
| author | Anatol Belski <ab@php.net> | 2015-01-15 17:51:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-15 17:51:43 +0100 |
| commit | 29688512b4579fc0f9dcd86587ce0e53855843d6 (patch) | |
| tree | 62428d8c75cb6bada3a1148f89fa44277cbbaa30 /ext/mysql/php_mysql.c | |
| parent | fc33f52d8c25997dd0711de3e07d0dc260a18c11 (diff) | |
| parent | 25041d2af2f7a5b50a6c6a6f0515521aa2edfac9 (diff) | |
| download | php-git-29688512b4579fc0f9dcd86587ce0e53855843d6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
Conflicts:
ext/pdo_mysql/mysql_driver.c
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions