Skip to content

Commit 122d070

Browse files
committed
MDEV-11761: CLIENT_DEPRECATE_EOF : Client must identify a "stored procedure output resultset"
fix proposed by Diego
1 parent 5dd4d66 commit 122d070

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

sql/protocol.cc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,16 +1617,14 @@ bool Protocol_binary::send_out_parameters(List<Item_param> *sp_params)
16171617
if (write())
16181618
return TRUE;
16191619

1620-
/* Restore THD::server_status. */
1621-
thd->server_status&= ~SERVER_PS_OUT_PARAMS;
1622-
16231620
ret= net_send_eof(thd, thd->server_status, 0);
16241621

16251622
/*
1626-
Reset SERVER_MORE_RESULTS_EXISTS bit, because this is the last packet
1627-
for sure.
1623+
Reset server_status:
1624+
- SERVER_MORE_RESULTS_EXISTS bit, because this is the last packet for sure.
1625+
- Restore SERVER_PS_OUT_PARAMS status.
16281626
*/
1629-
thd->server_status&= ~SERVER_MORE_RESULTS_EXISTS;
1627+
thd->server_status&= ~(SERVER_PS_OUT_PARAMS | SERVER_MORE_RESULTS_EXISTS);
16301628

16311629
return ret ? FALSE : TRUE;
16321630
}

0 commit comments

Comments
 (0)