From 5d54267d1943ad9e993ecd72e1284c367dc7cbe4 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Wed, 21 Mar 2018 11:14:16 +0200
Subject: [PATCH] MXS-1730 Add change that fixes the problem

ENGINE is a keyword but not a reserved word, so it must
silently convert into an identifier if it is used in a
context where it cannot be used as a keyword.
---
 query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y b/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
index 85ffb5e85..fc56410be 100644
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
+++ b/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
@@ -615,7 +615,8 @@ columnid(A) ::= nm(X). {
   BINARY
   /*CASCADE*/ CAST CLOSE COLUMNKW COLUMNS COMMENT CONCURRENT /*CONFLICT*/
   DATA /*DATABASE*/ DEALLOCATE DEFERRED /*DESC*/ /*DETACH*/ DUMPFILE
-  /*EACH*/ END ENUM EXCLUSIVE /*EXPLAIN*/
+<<<<<<< 9208d3a70ce049a5eff1078dc741b0f4c271cff7
+  /*EACH*/ END ENGINE ENUM EXCLUSIVE /*EXPLAIN*/
   FIRST FLUSH /*FOR*/ FORMAT
   GLOBAL
   // TODO: IF is a reserved word and should not automatically convert into an identifer.