]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 969072c 5d2813e)
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Wed, 7 Oct 2015 11:12:43 +0000 (14:12 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 7 Oct 2015 11:12:43 +0000 (14:12 +0300)
commit33c89e2bb4ec79c56b3c75430e47ee367231a568
treef5e1d9f8ebbb5ac8c318ecf99b1d8f61ef47c025tree | snapshot
parent969072c1bd1729d6990b810c127c77781d23d78dcommit | diff
parent5d2813edceaf24664388ac301adc885e147606a3commit | diff
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed test. MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes. Probably we need to add yet another condition to also check MariaDB version.
Unnamed repository; edit this file 'description' to name the repository.