merged from 5_2 (mysqli_info crash)

This commit is contained in:
Georg Richter 2007-01-06 05:50:36 +00:00
parent 3faf580a9a
commit a8d9958f70

View file

@ -1099,7 +1099,7 @@ PHP_FUNCTION(mysqli_info)
}
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);
}
/* }}} */