rasmus Wed, 31 Aug 2011 07:43:58 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315860
Log:
Since we are creating this csv file locally this should obviously
be a a LOCAL infile here for this to work reliably. For robustness
this should probably have a check for the local-infile server
setting as well.
Changed paths:
U
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
U php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
Modified:
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
===================================================================
---
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
2011-08-31 07:38:19 UTC (rev 315859)
+++
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
2011-08-31 07:43:58 UTC (rev 315860)
@@ -69,7 +69,7 @@
fwrite($fp, b"2;bar");
fclose($fp);
- $sql = sprintf("LOAD DATA INFILE %s INTO TABLE test FIELDS
TERMINATED BY ';' LINES TERMINATED BY '\n'", $db->quote($filename));
+ $sql = sprintf("LOAD DATA LOCAL INFILE %s INTO TABLE test
FIELDS TERMINATED BY ';' LINES TERMINATED BY '\n'", $db->quote($filename));
if (exec_and_count(4, $db, $sql, 2)) {
@@ -105,4 +105,4 @@
$db->exec('DROP TABLE IF EXISTS test');
?>
--EXPECTF--
-done!
\ No newline at end of file
+done!
Modified: php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
===================================================================
--- php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
2011-08-31 07:38:19 UTC (rev 315859)
+++ php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
2011-08-31 07:43:58 UTC (rev 315860)
@@ -69,7 +69,7 @@
fwrite($fp, b"2;bar");
fclose($fp);
- $sql = sprintf("LOAD DATA INFILE %s INTO TABLE test FIELDS
TERMINATED BY ';' LINES TERMINATED BY '\n'", $db->quote($filename));
+ $sql = sprintf("LOAD DATA LOCAL INFILE %s INTO TABLE test
FIELDS TERMINATED BY ';' LINES TERMINATED BY '\n'", $db->quote($filename));
if (exec_and_count(4, $db, $sql, 2)) {
@@ -105,4 +105,4 @@
$db->exec('DROP TABLE IF EXISTS test');
?>
--EXPECTF--
-done!
\ No newline at end of file
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
