diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-01-12 21:16:13 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-01-12 21:16:13 +0100 |
| commit | e8c98a74f05c9e1881af4515873ed9fe36a52be4 (patch) | |
| tree | 986513525681560619e1fa8ac53f6b2b02c9a6ff /ext/mysqlnd/mysqlnd_ps.c | |
| parent | c498284dec5240b3667163bd194abcb68307a7e3 (diff) | |
| parent | da5e09ad0389f53cdc78591442a3df1ff54c6ff0 (diff) | |
| download | php-git-e8c98a74f05c9e1881af4515873ed9fe36a52be4.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index c805e6f111..256bbe4d47 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -2032,8 +2032,9 @@ MYSQLND_METHOD(mysqlnd_stmt, free_result)(MYSQLND_STMT * const s) stmt->state = MYSQLND_STMT_PREPARED; } - /* Line is free! */ - SET_CONNECTION_STATE(&conn->state, CONN_READY); + if (GET_CONNECTION_STATE(&conn->state) != CONN_QUIT_SENT) { + SET_CONNECTION_STATE(&conn->state, CONN_READY); + } DBG_RETURN(PASS); } |