diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-06-20 11:16:57 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-06-20 11:16:57 +0400 |
| commit | 36374ff32d0408e5d9b71e4b4ad17592ae370c56 (patch) | |
| tree | f568a7a5113d2b7c3f3c7796e1a09475677502d1 /ext/mysql/php_mysql.c | |
| parent | 3f11ddcfe33a4156cd5338741ee901d8d265655a (diff) | |
| parent | ae9db5d0a227977b4b2aac34f1ba7532896201b7 (diff) | |
| download | php-git-36374ff32d0408e5d9b71e4b4ad17592ae370c56.tar.gz | |
Merge branch 'master' into phpng
* master:
skip this test which fails without network
add missing entry to NEWS
add missing entry to NEWS
add NEWS block for 5.6.0RC2
Add support for gb18030/MySQL 5.7
Fix another problem with MySQL 5.7
new test, missing in ea466a3
Suppress test failure with MySQL 5.7
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions