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

Fix merge problem with dbfwfilter

Browse Source 
Code was duplicated in the merge and the old function names were used.
This commit is contained in:
Markus Mäkelä
2017-02-01 09:58:38 +02:00
parent 712b720ef7
commit f2da434b56
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/modules/filter/dbfwfilter/dbfwfilter.c
View File

@ -2358,13 +2358,6 @@ routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *queue)
type = qc_get_type_mask(queue); type = qc_get_type_mask(queue);
} }
uint32_t type = 0;
if (modutil_is_SQL(queue) || modutil_is_SQL_prepare(queue))
{
type = qc_get_type(queue);
}
if (modutil_is_SQL(queue) && modutil_count_statements(queue) > 1) if (modutil_is_SQL(queue) && modutil_count_statements(queue) > 1)
{ {
GWBUF* err = gen_dummy_error(my_session, "This filter does not support " GWBUF* err = gen_dummy_error(my_session, "This filter does not support "
@ -2374,8 +2367,8 @@ routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *queue)
my_session->errmsg = NULL; my_session->errmsg = NULL;
rval = dcb->func.write(dcb, err); rval = dcb->func.write(dcb, err);
} }
else if (QUERY_IS_TYPE(type, QUERY_TYPE_PREPARE_STMT) || else if (qc_query_is_type(type, QUERY_TYPE_PREPARE_STMT) ||
QUERY_IS_TYPE(type, QUERY_TYPE_PREPARE_NAMED_STMT) || qc_query_is_type(type, QUERY_TYPE_PREPARE_NAMED_STMT) ||
modutil_is_SQL_prepare(queue)) modutil_is_SQL_prepare(queue))
{ {
GWBUF* err = gen_dummy_error(my_session, "This filter does not support " GWBUF* err = gen_dummy_error(my_session, "This filter does not support "