diff options
| author | Andrey Hristov <andrey@php.net> | 2015-09-25 14:29:06 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-09-25 14:29:06 +0200 |
| commit | 7e3cd7cadf015c63d1042899b7ba5e5719cb4ce5 (patch) | |
| tree | a3947bd6c79137ea20267801b11f658e7ade8573 /ext/mysqlnd/mysqlnd_net.c | |
| parent | 7e797f13026440c54e24f89cf29f46bb0b262a39 (diff) | |
| parent | 59de2c037c4c946fc43478edc154d89dda95873d (diff) | |
| download | php-git-7e3cd7cadf015c63d1042899b7ba5e5719cb4ce5.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_net.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index 72f7dfc5ad..d8ad4f713e 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -211,9 +211,11 @@ MYSQLND_METHOD(mysqlnd_net, open_tcp_or_unix)(MYSQLND_NET * const net, const cha mnd_sprintf_free(hashed_details); } errcode = CR_CONNECTION_ERROR; - SET_CLIENT_ERROR(*error_info, errcode? errcode:CR_CONNECTION_ERROR, UNKNOWN_SQLSTATE, ZSTR_VAL(errstr)); + SET_CLIENT_ERROR(*error_info, + CR_CONNECTION_ERROR, + UNKNOWN_SQLSTATE, + errstr? ZSTR_VAL(errstr):"Unknown error while connecting"); if (errstr) { - /* no mnd_ since we don't allocate it */ zend_string_release(errstr); } DBG_RETURN(NULL); |