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

MXS-1935: Accent NULL from qc_get_preparable_stmt in readwritesplit

Browse Source 
If the prepared statement cannot be extracted from the query, treat it as
a query with an unknown type.
This commit is contained in:
Markus Mäkelä
2018-06-21 10:04:34 +03:00
parent 067bca6e58
commit 9e4b86ff0a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/routing/readwritesplit/rwsplit_ps.cc
View File

@ -21,7 +21,7 @@
uint32_t get_prepare_type(GWBUF* buffer) uint32_t get_prepare_type(GWBUF* buffer)
{ {
uint32_t type; uint32_t type = QUERY_TYPE_UNKNOWN;
if (mxs_mysql_get_command(buffer) == MXS_COM_STMT_PREPARE) if (mxs_mysql_get_command(buffer) == MXS_COM_STMT_PREPARE)
{ {
@ -48,10 +48,12 @@ uint32_t get_prepare_type(GWBUF* buffer)
else else
{ {
GWBUF* stmt = qc_get_preparable_stmt(buffer); GWBUF* stmt = qc_get_preparable_stmt(buffer);
ss_dassert(stmt);
if (stmt)
{
type = qc_get_type_mask(stmt); type = qc_get_type_mask(stmt);
} }
}
ss_dassert((type & (QUERY_TYPE_PREPARE_STMT | QUERY_TYPE_PREPARE_NAMED_STMT)) == 0); ss_dassert((type & (QUERY_TYPE_PREPARE_STMT | QUERY_TYPE_PREPARE_NAMED_STMT)) == 0);