diff options
| author | Nikita Popov <nikic@php.net> | 2017-01-03 12:18:33 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2017-01-03 12:18:33 +0100 |
| commit | 661fad7beb71d1096e93b0212624ad5f94e5a648 (patch) | |
| tree | 7a225aa3855d91aec21b4b45fc9feb65f4ad3f39 /ext/mysqli/mysqli_nonapi.c | |
| parent | e42a01bcd54eaaa62e18a648a4a310063bd0abf1 (diff) | |
| parent | b3889d4b20aaec16ceb89fe64e42de7c464e20e1 (diff) | |
| download | php-git-661fad7beb71d1096e93b0212624ad5f94e5a648.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index e3efca25c6..83de52dcf5 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -183,6 +183,10 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne mysqlnd_restart_psession(mysql->mysql); #endif MyG(num_active_persistent)++; + + /* clear error */ + php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); + goto end; } else { mysqli_close(mysql->mysql, MYSQLI_CLOSE_IMPLICIT); |