com php-src: Merge branch 'PHP-7.1': ext/pdo_mysql/tests/pdo _mysql_exec_load_data.phpt ext/pdo_mysql/tests/pd o_mysql_prepare_load_data.phpt
| From: | Matteo Beccati | Date: | Thu, 15 Dec 2016 08:32:26 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1': ext/pdo_mysql/tests/pdo _mysql_exec_load_data.phpt ext/pdo_mysql/tests/pd o_mysql_prepare_load_data.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96335@lists.php.net to get a copy of this message | ||
Commit: d060060c08fd3158f99fb9f9adfccf49978661d8
Author: Matteo Beccati <mbeccati@php.net> Thu, 15 Dec 2016 09:32:26 +0100
Parents: e1ef67625a205a34ec91d1a8958278ac129d1639 72fb941bd47aeaa8fd4100aacc945e5372984ac2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d060060c08fd3158f99fb9f9adfccf49978661d8
Log:
Merge branch 'PHP-7.1'
* PHP-7.1:
Skip tests when secure_file_priv dir not writable
Add missing UPGRADING entry. Manual is updated before 7.0 release.
Changed paths:
MM ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
MM ext/pdo_mysql/tests/pdo_mysql_prepare_load_data.phpt
Diff: