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

Fix merge issues

Browse Source
This commit is contained in:
Johan Wikman 2017-01-09 09:37:11 +02:00
parent e7981c9d67
commit 9ba06f7c07
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/filter/masking/maskingfilter.cc
View File

@ -172,14 +172,12 @@ void MaskingFilter::reload(DCB* pOut)
}
// static
bool MaskingFilter::process_params(char **pzOptions, CONFIG_PARAMETER *ppParams, Config& config)
bool MaskingFilter::process_params(char **pzOptions, CONFIG_PARAMETER *pParams, Config& config)
{
bool error = false;
for (int i = 0; ppParams[i]; ++i)
for (const CONFIG_PARAMETER* pParam = pParams; pParam; pParam = pParam->next)
{
const FILTER_PARAMETER *pParam = ppParams[i];
if (strcmp(pParam->name, "rules_file") == 0)
{
string rules_file;

2
server/modules/filter/masking/maskingfiltersession.cc
View File

@ -123,7 +123,7 @@ void MaskingFilterSession::handle_field(GWBUF* pPacket)
ComQueryResponse::ColumnDef column_def(pPacket);
const char *zUser = session_getUser(m_pSession);
const char *zUser = session_get_user(m_pSession);
const char *zHost = session_get_remote(m_pSession);
if (!zUser)