diff options
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index cfed17880e..e6a7bcc4c3 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -52,6 +52,17 @@ PHP_FUNCTION(mysqli_connect) return; } + if (!passwd) { + passwd = MyG(default_pw); + if (!username){ + username = MyG(default_user); + if (!hostname) { + hostname = MyG(default_host); + } + } + } + + mysql = (MY_MYSQL *) ecalloc(1, sizeof(MY_MYSQL)); if (!(mysql->mysql = mysql_init(NULL))) { @@ -121,7 +132,7 @@ PHP_FUNCTION(mysqli_connect_errno) PHP_FUNCTION(mysqli_connect_error) { if (MyG(error_msg)) { - ZVAL_UTF8_STRING(return_value, (char *)MyG(error_msg), ZSTR_DUPLICATE); + RETURN_UTF8_STRING((char *)MyG(error_msg), ZSTR_DUPLICATE); } else { RETURN_NULL(); } |