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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Johan Wikman
2018-02-08 18:40:29 +02:00
parent 5326c8db5c 5a33a5a013
commit fcde23e6fe
14 changed files with 190 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/load_utils.cc
View File

@ -24,6 +24,7 @@
#include <string.h>
#include <dlfcn.h>
#include <algorithm>
#include <string>
#include <maxscale/modinfo.h>
#include <maxscale/log_manager.h>

6
server/core/modutil.cc
View File

@ -637,9 +637,11 @@ int modutil_count_signal_packets(GWBUF *reply, int n_found, bool* more_out, modu
bool skip_next = state ? state->state : false;
bool more = false;
bool only_ok = true;
uint64_t num_packets = 0;
while (offset < len)
{
num_packets++;
uint8_t header[MYSQL_HEADER_LEN + 5]; // Maximum size of an EOF packet
gwbuf_copy_data(reply, offset, MYSQL_HEADER_LEN + 1, header);
@ -720,7 +722,9 @@ int modutil_count_signal_packets(GWBUF *reply, int n_found, bool* more_out, modu
*more_out = more;
if (only_ok && !more)
// Treat complete multi-statement result sets that consist of only OK packets as a single result set
// TODO: Review this, it doesn't look very convincing.
if (only_ok && !more && num_packets > 1)
{
total = 2;
}