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

MXS-1196: Amend default arguments with given

Browse Source
This commit is contained in:
Johan Wikman
2017-05-22 13:04:56 +03:00
parent 6b93a44be1
commit bea8513f9d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
query_classifier/test/compare.cc
View File

@ -1325,9 +1325,9 @@ int main(int argc, char* argv[])
const char* zClassifier2 = "qc_sqlite"; const char* zClassifier2 = "qc_sqlite";
const char* zClassifier1Args = NULL; const char* zClassifier1Args = NULL;
#if defined(USING_MARIADB_103) #if defined(USING_MARIADB_103)
const char* zClassifier2Args = "parse_as=10.3,log_unrecognized_statements=1"; string classifier2Args("parse_as=10.3,log_unrecognized_statements=1");
#else #else
const char* zClassifier2Args = "log_unrecognized_statements=1"; string classifier2Args("log_unrecognized_statements=1");
#endif #endif
const char* zStatement = NULL; const char* zStatement = NULL;
@ -1359,7 +1359,8 @@ int main(int argc, char* argv[])
break; break;
case 'B': case 'B':
zClassifier2Args = optarg; classifier2Args += ",";
classifier2Args += optarg;
break; break;
case 'd': case 'd':
@ -1399,6 +1400,8 @@ int main(int argc, char* argv[])
if (mxs_log_init(NULL, ".", MXS_LOG_TARGET_DEFAULT)) if (mxs_log_init(NULL, ".", MXS_LOG_TARGET_DEFAULT))
{ {
const char* zClassifier2Args = classifier2Args.c_str();
QUERY_CLASSIFIER* pClassifier1; QUERY_CLASSIFIER* pClassifier1;
QUERY_CLASSIFIER* pClassifier2; QUERY_CLASSIFIER* pClassifier2;