From 35620f8daeee3604947ea239457fc568171050e6 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Wed, 23 Nov 2016 14:35:46 +0200
Subject: [PATCH] Build compare using embedded library

For whatever reason compare fails to load qc_mysqlembedded if
it has not been built with the embedded library. Needs to be
sorted out at some point.
---
 query_classifier/test/CMakeLists.txt | 56 ++++++++++++++++++----------
 query_classifier/test/compare.cc     |  3 ++
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/query_classifier/test/CMakeLists.txt b/query_classifier/test/CMakeLists.txt
index 8a11ba495..68de663a7 100644
--- a/query_classifier/test/CMakeLists.txt
+++ b/query_classifier/test/CMakeLists.txt
@@ -1,28 +1,44 @@
-# Use the client libraries in MaxScale core
-include_directories(${MARIADB_CONNECTOR_INCLUDE_DIR})
+# Include the embedded library headers
+if (BUILD_QC_MYSQLEMBEDDED)
+  subdirs(MYSQL_INCLUDE_DIR_ALL ${MYSQL_EMBEDDED_INCLUDE_DIR})
+  foreach(DIR ${MYSQL_INCLUDE_DIR_ALL})
+    include_directories(${DIR})
+  endforeach()
+  include_directories(${MYSQL_EMBEDDED_INCLUDE_DIR}/..)
 
-add_executable(classify classify.c)
-target_link_libraries(classify maxscale-common)
+  if(${ERRMSG} MATCHES "ERRMSG-NOTFOUND")
+    message(FATAL_ERROR "The errmsg.sys file was not found, please define the path with -DERRMSG=<path>")
+  else()
+    if(${CMAKE_VERSION} VERSION_LESS 2.8)
+	  execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${ERRMSG} ${CMAKE_CURRENT_BINARY_DIR})
+    else()
+	  file(COPY ${ERRMSG} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
+  endif()
 
-add_executable(compare compare.cc)
-target_link_libraries(compare maxscale-common)
+  add_executable(classify classify.c)
+  target_link_libraries(classify maxscale-common)
 
-add_executable(crash_qc_sqlite crash_qc_sqlite.c)
-target_link_libraries(crash_qc_sqlite maxscale-common)
+  add_executable(compare compare.cc)
+  target_link_libraries(compare maxscale-common)
 
-add_test(TestQC_Crash_qcsqlite crash_qc_sqlite)
+  add_executable(crash_qc_sqlite crash_qc_sqlite.c)
+  target_link_libraries(crash_qc_sqlite maxscale-common)
 
-add_test(TestQC_MySQLEmbedded classify qc_mysqlembedded ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
-add_test(TestQC_SqLite classify qc_sqlite ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
+  add_test(TestQC_Crash_qcsqlite crash_qc_sqlite)
 
-add_test(TestQC_CompareCreate compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/create.test)
-add_test(TestQC_CompareDelete compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/delete.test)
-add_test(TestQC_CompareInsert compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/insert.test)
-add_test(TestQC_CompareJoin compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/join.test)
-add_test(TestQC_CompareSelect compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/select.test)
-add_test(TestQC_CompareSet compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/set.test)
-add_test(TestQC_CompareUpdate compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/update.test)
-add_test(TestQC_CompareMaxScale compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/maxscale.test)
-add_test(TestQC_CompareWhiteSpace compare -v 2 -S -s "select user from mysql.user; ")
+  add_test(TestQC_MySQLEmbedded classify qc_mysqlembedded ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
+  add_test(TestQC_SqLite classify qc_sqlite ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
+
+  add_test(TestQC_CompareCreate compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/create.test)
+  add_test(TestQC_CompareDelete compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/delete.test)
+  add_test(TestQC_CompareInsert compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/insert.test)
+  add_test(TestQC_CompareJoin compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/join.test)
+  add_test(TestQC_CompareSelect compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/select.test)
+  add_test(TestQC_CompareSet compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/set.test)
+  add_test(TestQC_CompareUpdate compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/update.test)
+  add_test(TestQC_CompareMaxScale compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/maxscale.test)
+  add_test(TestQC_CompareWhiteSpace compare -v 2 -S -s "select user from mysql.user; ")
+endif()
 
 add_subdirectory(canonical_tests)
diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc
index 102b9e42b..1a5d6fd20 100644
--- a/query_classifier/test/compare.cc
+++ b/query_classifier/test/compare.cc
@@ -20,6 +20,9 @@
 #include <set>
 #include <string>
 #include <sstream>
+#define MYSQL_COM_QUIT        COM_QUIT
+#define MYSQL_COM_INIT_DB     COM_INIT_DB
+#define MYSQL_COM_CHANGE_USER COM_CHANGE_USER
 #include <maxscale/gwdirs.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/protocol/mysql.h>