diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-03 21:59:09 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-03 22:00:51 -0700 |
| commit | 74e52eaea9c9d030dd70cf915b6f506065741dca (patch) | |
| tree | cf5975135d9ae59f70ed28a9cefa2bd77d8dda72 /ext/mysqlnd/mysqlnd_auth.c | |
| parent | d8f938c78478c211dc3b5609e9f37d2e2c47896f (diff) | |
| parent | 90bb28726bd0728059b0d58b1c063ae8ea250966 (diff) | |
| download | php-git-74e52eaea9c9d030dd70cf915b6f506065741dca.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
news for dblib fixes
Fix PDO_DBLIB bugs: #64338, #64808, #63638
Conflicts:
ext/pdo_dblib/dblib_driver.c
ext/pdo_dblib/dblib_stmt.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
0 files changed, 0 insertions, 0 deletions