From 621b66ab13f8bc1530cab7425441910714227851 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Mon, 25 Sep 2017 14:04:03 +0300
Subject: [PATCH] Thread initialization added

Also the main thread must now explicitly be initialized.
---
 query_classifier/test/classify.c             | 4 +++-
 query_classifier/test/crash_qc_sqlite.c      | 4 +++-
 query_classifier/test/version_sensitivity.cc | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/query_classifier/test/classify.c b/query_classifier/test/classify.c
index 39ac87aa9..cb2cd2080 100644
--- a/query_classifier/test/classify.c
+++ b/query_classifier/test/classify.c
@@ -313,7 +313,9 @@ int main(int argc, char** argv)
 
         if (mxs_log_init(NULL, ".", MXS_LOG_TARGET_DEFAULT))
         {
-            if (qc_setup(lib, QC_SQL_MODE_DEFAULT, NULL) && qc_process_init(QC_INIT_BOTH))
+            if (qc_setup(lib, QC_SQL_MODE_DEFAULT, NULL) &&
+                qc_process_init(QC_INIT_BOTH) &&
+                qc_thread_init(QC_INIT_BOTH))
             {
                 rc = run(input_name, expected_name);
                 qc_process_end(QC_INIT_BOTH);
diff --git a/query_classifier/test/crash_qc_sqlite.c b/query_classifier/test/crash_qc_sqlite.c
index 23930f66c..c3d4fda8c 100644
--- a/query_classifier/test/crash_qc_sqlite.c
+++ b/query_classifier/test/crash_qc_sqlite.c
@@ -41,7 +41,9 @@ int main()
 
     set_libdir(strdup("../qc_sqlite"));
 
-    if (qc_setup("qc_sqlite", QC_SQL_MODE_DEFAULT, NULL) && qc_process_init(QC_INIT_BOTH))
+    if (qc_setup("qc_sqlite", QC_SQL_MODE_DEFAULT, NULL) &&
+        qc_process_init(QC_INIT_BOTH) &&
+        qc_thread_init(QC_INIT_BOTH))
     {
         const char s[] = "SELECT @@global.max_allowed_packet";
 
diff --git a/query_classifier/test/version_sensitivity.cc b/query_classifier/test/version_sensitivity.cc
index 9831b166b..6655f1355 100644
--- a/query_classifier/test/version_sensitivity.cc
+++ b/query_classifier/test/version_sensitivity.cc
@@ -133,13 +133,13 @@ int main(int argc, char* argv[])
 
         if (qc_setup(QC_LIB, QC_SQL_MODE_DEFAULT, NULL))
         {
-            if (qc_process_init(QC_INIT_BOTH))
+            if (qc_process_init(QC_INIT_BOTH) && qc_thread_init(QC_INIT_BOTH))
             {
                 rc = test();
             }
             else
             {
-                cerr << "error: Could not perform process initialization for " << QC_LIB << "." << endl;
+                cerr << "error: Could not perform process/thread initialization for " << QC_LIB << "." << endl;
             }
         }
         else