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:
Markus Mäkelä
2018-06-21 11:45:23 +03:00
parent 8bd9e1d473 9e4b86ff0a
commit 92b1767fb1
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/Getting-Started/Configuration-Guide.md
View File

@ -82,6 +82,14 @@ The values of the parameter that are not on the first line need to have at least
one whitespace character before them in order for them to be recognized as a one whitespace character before them in order for them to be recognized as a
part of the multi-line parameter. part of the multi-line parameter.
Comments are defined by prefixing a row with a hash (`#`). Trailing comments are
not supported.
```
# This is a comment before a parameter
some_parameter=123
```
### Special Parameter Types ### Special Parameter Types
#### Sizes #### Sizes

8
server/core/queryclassifier.cc
View File

@ -100,7 +100,7 @@ bool are_multi_statements_allowed(MXS_SESSION* pSession)
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)
{ {
@ -127,9 +127,11 @@ 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);
type = qc_get_type_mask(stmt); if (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);