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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2019-07-04 09:39:52 +03:00
parent 73803fff70 be8f4fe055
commit 8960d2df8f
6 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/core/queryclassifier.cc
View File

@ -956,8 +956,15 @@ QueryClassifier::current_target_t QueryClassifier::handle_multi_temp_and_load(
bool QueryClassifier::query_continues_ps(uint8_t cmd, uint32_t stmt_id, GWBUF* buffer)
{
bool rval = false;
uint8_t prev_cmd = m_route_info.command();
if (cmd == COM_STMT_FETCH)
if (prev_cmd == MXS_COM_STMT_SEND_LONG_DATA
&& (cmd == MXS_COM_STMT_EXECUTE || cmd == MXS_COM_STMT_SEND_LONG_DATA))
{
// PS execution must be sent to the same server where the data was sent
rval = true;
}
else if (cmd == COM_STMT_FETCH)
{
// COM_STMT_FETCH should always go to the same target as the COM_STMT_EXECUTE
rval = true;