georg Fri Mar 24 12:10:39 2006 UTC Added files: (Branch: PHP_5_1) /php-src/ext/mysqli/tests bug36745.phpt
Modified files: /php-src NEWS /php-src/ext/mysqli mysqli.c Log: fix and testcase for bug #36745 http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.479&r2=1.2027.2.480&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.479 php-src/NEWS:1.2027.2.480 --- php-src/NEWS:1.2027.2.479 Fri Mar 24 08:45:54 2006 +++ php-src/NEWS Fri Mar 24 12:10:38 2006 @@ -19,6 +19,8 @@ - Fixed bug #36808 (syslog ident becomes garbage between requests). (Tony) - Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection). (Ilia) +- Fixed bug #36745 (No error message when load data local file isn't found). + (Georg) - Fixed bug #36721 (The SoapServer is not able to send a header that it didn't receive). (Dmitry) - Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob) http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.11&r2=1.72.2.12&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.11 php-src/ext/mysqli/mysqli.c:1.72.2.12 --- php-src/ext/mysqli/mysqli.c:1.72.2.11 Fri Mar 24 09:32:24 2006 +++ php-src/ext/mysqli/mysqli.c Fri Mar 24 12:10:38 2006 @@ -15,7 +15,7 @@ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.72.2.11 2006/03/24 09:32:24 georg Exp $ + $Id: mysqli.c,v 1.72.2.12 2006/03/24 12:10:38 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -976,6 +976,7 @@ mysql->li_stream = php_stream_open_wrapper_ex((char *)filename, "r", 0, NULL, context); if (mysql->li_stream == NULL) { + sprintf((char *)data->error_msg, "Can't find file '%-.64s'.", filename); return 1; } http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/tests/bug36745.phpt?view=markup&rev=1.1 Index: php-src/ext/mysqli/tests/bug36745.phpt +++ php-src/ext/mysqli/tests/bug36745.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php