Merge branch '2.1' into 2.2

2018-03-21 13:27:51 +02:00
parent 2cc0c5f1aa 041b775150
commit a996ea58ef
3 changed files with 5 additions and 1 deletions
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
+++ b/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
@ -615,6 +615,7 @@ columnid(A) ::= nm(X). {
  BINARY
  /*CASCADE*/ CAST CLOSE COLUMNKW COLUMNS COMMENT CONCURRENT /*CONFLICT*/
  DATA /*DATABASE*/ DEALLOCATE DEFERRED /*DESC*/ /*DETACH*/ DUMPFILE
+  /*EACH*/ END ENGINE ENUM EXCLUSIVE /*EXPLAIN*/
  /*EACH*/ END ENUM EXCLUSIVE /*EXPLAIN*/
  FIRST FLUSH /*FOR*/ FORMAT
  GLOBAL