hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MaxRows: 0x0 detection in handle_rows() removed

Browse Source 
The 0x0 detection handle_rows was added for MULTI result detection, now
moved in handle_expecting_response.

Additionally 0x0 conflicts with empty string data.

CLIENT_DEPRECATE_EOF is not supported right now
This commit is contained in:
MassimilianoPinto
2016-12-22 17:03:57 +01:00
parent 6a53e70314
commit 65ca6a4be8
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/modules/filter/maxrows/maxrows.c
View File

@ -757,15 +757,16 @@ static int handle_rows(MAXROWS_SESSION_DATA *csdata)
break; break;
case 0x0: // OK packet after the rows. /* OK could the last packet in the Multi-Resultset transmission:
/* OK could the last packet in the Multi-Resultset transmission: * this is handled by handle_expecting_response()
* handle DISCARD or send all the data. *
* * It could also be sent instead of EOF from as in MySQL 5.7.5
* It could also be sent instead of EOF from as in MySQL 5.7.5 * if client sends CLIENT_DEPRECATE_EOF capability OK packet could
* if client sends CLIENT_DEPRECATE_EOF capability OK packet could * have the SERVER_MORE_RESULTS_EXIST flag.
* have the SERVER_MORE_RESULTS_EXIST flag. * Flags in the OK packet are at the same offset as in EOF.
* Note: Flags in the OK packet are at the same offset as in EOF. *
*/ * NOTE: not supported right now
*/
case 0xfe: // EOF, the one after the rows. case 0xfe: // EOF, the one after the rows.
csdata->res.offset += packetlen; csdata->res.offset += packetlen;
ss_dassert(csdata->res.offset == buflen); ss_dassert(csdata->res.offset == buflen);