diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-18 14:20:06 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-18 14:20:06 +0400 |
| commit | 7d0c354f5c354b45f9d9dadf2ff5ea02ba0b1071 (patch) | |
| tree | f78a9c086879b1c4b068d2fb2fd99863beb51141 /sql/protocol.cc | |
| parent | b13ce223a886a0d3a28b243d5fee39ec608d5192 (diff) | |
| parent | 6c5cfbbf3399887baff489f089641385c112c9a0 (diff) | |
| download | mariadb-git-7d0c354f5c354b45f9d9dadf2ff5ea02ba0b1071.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 3cc73071310..0c3ff2792c0 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -1617,16 +1617,14 @@ bool Protocol_binary::send_out_parameters(List<Item_param> *sp_params) if (write()) return TRUE; - /* Restore THD::server_status. */ - thd->server_status&= ~SERVER_PS_OUT_PARAMS; - ret= net_send_eof(thd, thd->server_status, 0); /* - Reset SERVER_MORE_RESULTS_EXISTS bit, because this is the last packet - for sure. + Reset server_status: + - SERVER_MORE_RESULTS_EXISTS bit, because this is the last packet for sure. + - Restore SERVER_PS_OUT_PARAMS status. */ - thd->server_status&= ~SERVER_MORE_RESULTS_EXISTS; + thd->server_status&= ~(SERVER_PS_OUT_PARAMS | SERVER_MORE_RESULTS_EXISTS); return ret ? FALSE : TRUE; } |