diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-01-24 19:20:30 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-03-14 11:54:16 +0100 |
| commit | 28cf444ebbab6c72bfb213cec6d1fead3a56b1f5 (patch) | |
| tree | 72755688ea3fb2fa1116e41c80194d280993d436 | |
| parent | a77c2ea78f76c07446a3014052cb8c3b74c4860c (diff) | |
| download | mariadb-git-bb-sanja-10.2-MDEV-11761.tar.gz | |
MDEV-11761: CLIENT_DEPRECATE_EOF : Client must identify a "stored procedure output resultset"bb-sanja-10.2-MDEV-11761
fix proposed by Diego
| -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..e7825c9668a 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; } |