Merge branch '2.1.7' into develop-2.1-merge

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

@@ -612,6 +612,7 @@ columnid(A) ::= nm(X). {
   /*KEY*/
   /*LIKE_KW*/
   MASTER /*MATCH*/ MERGE
+  NAMES
   NO
   OF OFFSET OPEN
   QUICK

query_classifier/test/maxscale.test

@@ -79,3 +79,8 @@ ROLLBACK TO id;
 RELEASE SAVEPOINT id;
 
 SELECT her FROM (SELECT @@server_id as her) as t WHERE her REGEXP '.*';
+
+select * from db1.t1 union select * from db2.t2;
+
+# Names is a keyword as well
+select names from t;