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

Fix forgotten merge conflict.

Browse Source
This commit is contained in:
Johan Wikman
2016-02-08 10:55:08 +02:00
parent c579ed7fce
commit 0cc3db9634
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
query_classifier/query_classifier.cc
View File

@ -133,21 +133,12 @@ bool qc_is_real_query(GWBUF* query)
return classifier->qc_is_real_query(query); return classifier->qc_is_real_query(query);
} }
<<<<<<< HEAD
char** qc_get_table_names(GWBUF* query, int* tblsize, bool fullnames) char** qc_get_table_names(GWBUF* query, int* tblsize, bool fullnames)
{ {
QC_TRACE(); QC_TRACE();
ss_dassert(classifier); ss_dassert(classifier);
=======
char** qc_get_table_names(GWBUF* query, int* tblsize, bool fullnames)
{
QC_TRACE();
ss_dassert(classifier);
>>>>>>> origin/MXS-517
return classifier->qc_get_table_names(query, tblsize, fullnames); return classifier->qc_get_table_names(query, tblsize, fullnames);
} }