[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] cvs: php-src /ext/mysqli/tests local_infile_tools.inc mysqli_set_local_infile_handler.phpt
From:       "Ulf Wendel" <uw () php ! net>
Date:       2009-05-29 13:36:54
Message-ID: cvsuw1243604214 () cvsserver
[Download RAW message or body]

uw		Fri May 29 13:36:54 2009 UTC

  Modified files:              
    /php-src/ext/mysqli/tests	mysqli_set_local_infile_handler.phpt 
                             	local_infile_tools.inc 
  Log:
  Fixing tests - messages/warnings can vary by version
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt?r1=1.5&r2=1.6&diff_format=u
                
Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt
diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt:1.5 \
                php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt:1.6
--- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt:1.5	Thu May 28 \
                14:11:41 2009
+++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt	Fri May 29 13:36:53 \
2009 @@ -170,7 +170,7 @@
 Callback: 1
 Callback set to 'callback_fclose'
 Callback: 0
-[022] LOAD DATA failed, [2000] File handle closed in handler
+[022] LOAD DATA failed, [2000] File handle close%s
 Callback set to 'callback_invalid_args'
 Callback: 0
 Callback: 1
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/local_infile_tools.inc?r1=1.2&r2=1.3&diff_format=u
                
Index: php-src/ext/mysqli/tests/local_infile_tools.inc
diff -u php-src/ext/mysqli/tests/local_infile_tools.inc:1.2 \
                php-src/ext/mysqli/tests/local_infile_tools.inc:1.3
--- php-src/ext/mysqli/tests/local_infile_tools.inc:1.2	Thu May 28 14:11:41 2009
+++ php-src/ext/mysqli/tests/local_infile_tools.inc	Fri May 29 13:36:54 2009
@@ -58,7 +58,7 @@
 			return false;
 		}
 
-		if (!mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s'
+		if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s'
 			INTO TABLE test
 			FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
 			LINES TERMINATED BY '\n'",



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]