Merge branch '2.3' into 2.4

query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y

@@ -627,6 +627,7 @@ columnid(A) ::= nm(X). {
   /*EACH*/ END ENGINE ENUM EXCLUSIVE /*EXPLAIN*/ EXTENDED
   FIELDS FIRST FLUSH /*FOR*/ FORMAT
   GLOBAL
+  HANDLER
   // TODO: IF is a reserved word and should not automatically convert into an identifer.
   IF IMMEDIATE INITIALLY INSTEAD
   /*KEY*/

query_classifier/test/CMakeLists.txt

@@ -36,11 +36,12 @@ target_link_libraries(crash_qc_sqlite maxscale-common)
 
 add_test(test_qc_crash_qcsqlite crash_qc_sqlite)
 
+add_test(testQC_SqLite classify qc_sqlite ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
+
 if (BUILD_QC_MYSQLEMBEDDED)
   # test_qc_MySQLEmbedded excluded, classify is now solely used for verifying the
   # functionality of qc_sqlite.
   #add_test(test_qc_MySQLEmbedded classify qc_mysqlembedded ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
-  add_test(test_qc_sqlite classify qc_sqlite ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
 
   add_test(test_qc_comparecreate compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/create.test)
   add_test(test_qc_comparedelete compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/delete.test)

query_classifier/test/expected.sql

@@ -35,3 +35,4 @@ QUERY_TYPE_READ|QUERY_TYPE_MASTER_READ
 QUERY_TYPE_WRITE
 QUERY_TYPE_READ
 QUERY_TYPE_WRITE
+QUERY_TYPE_WRITE

query_classifier/test/input.sql

@@ -35,3 +35,4 @@ SELECT 1 AS c1 FROM t1 ORDER BY ( SELECT 1 AS c2 FROM t1 GROUP BY GREATEST(LAST_
 SET PASSWORD FOR 'user'@'10.0.0.1'='*C50EB75D7CB4C76B5264218B92BC69E6815B057A';
 SELECT UTC_TIMESTAMP();
 SELECT COUNT(IF(!c.ispackage, 1, NULL)) as cnt FROM test FOR UPDATE;
+SELECT handler FROM abc FOR UPDATE;