georg Sat Jan 6 05:50:36 2007 UTC Modified files: /php-src/ext/mysqli mysqli_api.c Log: merged from 5_2 (mysqli_info crash) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.141&r2=1.142&diff_format=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.141 php-src/ext/mysqli/mysqli_api.c:1.142 --- php-src/ext/mysqli/mysqli_api.c:1.141 Tue Jan 2 05:49:05 2007 +++ php-src/ext/mysqli/mysqli_api.c Sat Jan 6 05:50:36 2007 @@ -15,7 +15,7 @@ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.141 2007/01/02 05:49:05 georg Exp $ + $Id: mysqli_api.c,v 1.142 2007/01/06 05:50:36 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -1099,7 +1099,7 @@ } MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); - RETURN_UTF8_STRING(mysql->mysql->info, ZSTR_DUPLICATE); + RETURN_UTF8_STRING((mysql->mysql->info) ? mysql->mysql->info : "", ZSTR_DUPLICATE); } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php