Merge commit 'ea75b1b' into PHP-5.5

rlerdorf · rlerdorf · commit 9ca791066158 · 2013-08-02T15:33:40.000-04:00
* commit 'ea75b1b':
  This test needs local infile enabled
diff --git 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));
 

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ if (($tmp[1] !== 'localhost') && ($tmp[1] !== '127.0.0.1'))`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');`
	`51`	`+ putenv('PDOTEST_ATTR='.serialize([PDO::MYSQL_ATTR_LOCAL_INFILE=>true]));`
`51`	`52`	`$db = MySQLPDOTest::factory();`
`52`	`53`	`MySQLPDOTest::createTestTable($db, MySQLPDOTest::detect_transactional_mysql_engine($db));`
`53`	`54`