diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-01-24 19:20:30 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-03-15 13:45:14 +0100 |
| commit | 122d0701f7b933145d068d66fe72f6959b9afb14 (patch) | |
| tree | 7826c34946834c95e2ef3be9967e2091aeeccb86 /sql/protocol.cc | |
| parent | 5dd4d663faec324b4091ab199ab01a015e18f71e (diff) | |
| download | mariadb-git-122d0701f7b933145d068d66fe72f6959b9afb14.tar.gz | |
MDEV-11761: CLIENT_DEPRECATE_EOF : Client must identify a "stored procedure output resultset"
fix proposed by Diego
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 f8b68c02fff..b9d9f28831e 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; } |