Merge branch '2.1.7' into develop-2.1-merge

2017-09-12 11:08:02 +03:00
parent 65066ae126 2a4bfc31ec
commit 02b9e0a01d
28 changed files with 367 additions and 90 deletions
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
+++ b/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