summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2013-08-02 15:33:40 -0400
committerRasmus Lerdorf <rasmus@php.net>2013-08-02 15:33:40 -0400
commit9ca79106615824fff1d3f97a1fd7dc9e2d051fb6 (patch)
tree4af978e922b60f623d8ef36b924150f0bd91931c
parent3d0aca80f2f8a63627213881ea06f7ce4d499b14 (diff)
parentea75b1b5dbb34a8c07f53487e08a3521fc491a84 (diff)
downloadphp-git-9ca79106615824fff1d3f97a1fd7dc9e2d051fb6.tar.gz
Merge commit 'ea75b1b' into PHP-5.5
* commit 'ea75b1b': This test needs local infile enabled
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
index b550cb8da3..ebf22ef61b 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
@@ -48,6 +48,7 @@ if (($tmp[1] !== 'localhost') && ($tmp[1] !== '127.0.0.1'))
}
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+ putenv('PDOTEST_ATTR='.serialize([PDO::MYSQL_ATTR_LOCAL_INFILE=>true]));
$db = MySQLPDOTest::factory();
MySQLPDOTest::createTestTable($db, MySQLPDOTest::detect_transactional_mysql_engine($db));