From 9ea380c456a7de741c39c36590c67733c45254a0 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 4 May 2017 14:46:51 +0300 Subject: [PATCH] MXS-1196: Turn on 10.3 mode for qc_sqlite Turn on 10.3 mode for qc_sqlite if qc_mysqlembedded is built using 10.3. --- query_classifier/test/compare.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc index 226d47677..9f0ab2cca 100644 --- a/query_classifier/test/compare.cc +++ b/query_classifier/test/compare.cc @@ -20,6 +20,7 @@ #include #include #include +#include #define MYSQL_COM_QUIT COM_QUIT #define MYSQL_COM_INIT_DB COM_INIT_DB #define MYSQL_COM_CHANGE_USER COM_CHANGE_USER @@ -39,6 +40,12 @@ using std::ostream; using std::string; using std::stringstream; +#if MYSQL_VERSION_MAJOR == 10 && MYSQL_VERSION_MINOR == 3 +#define USING_MARIADB_103 +#else +#undef USING_MARIADB_103 +#endif + namespace { @@ -1317,7 +1324,11 @@ int main(int argc, char* argv[]) const char* zClassifier1 = "qc_mysqlembedded"; const char* zClassifier2 = "qc_sqlite"; const char* zClassifier1Args = NULL; +#if defined(USING_MARIADB_103) + const char* zClassifier2Args = "parse_as=10.3,log_unrecognized_statements=1"; +#else const char* zClassifier2Args = "log_unrecognized_statements=1"; +#endif const char* zStatement = NULL; size_t rounds = 1;