diff options
author | Dmitry Stogov <dmitry@zend.com> | 2014-06-20 14:01:22 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2014-06-20 14:01:22 +0400 |
commit | 687fa7d63d651dcace32054a6e50131f9edfa07d (patch) | |
tree | 2aeb0ae58a134a8b34651e0042125ccfce5afdc8 /ext/mysql/php_mysql.c | |
parent | ae9db5d0a227977b4b2aac34f1ba7532896201b7 (diff) | |
parent | f08a5bfadc360cb53574bdb2f4dc32ac30636133 (diff) | |
download | php-git-687fa7d63d651dcace32054a6e50131f9edfa07d.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed MarinaDB support
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions