Fix merge breakage

This commit is contained in:
Johan Wikman
2018-03-21 14:20:54 +02:00
parent 092286297e
commit 0e3874781f

View File

@ -616,7 +616,6 @@ columnid(A) ::= nm(X). {
/*CASCADE*/ CAST CLOSE COLUMNKW COLUMNS COMMENT CONCURRENT /*CONFLICT*/ /*CASCADE*/ CAST CLOSE COLUMNKW COLUMNS COMMENT CONCURRENT /*CONFLICT*/
DATA /*DATABASE*/ DEALLOCATE DEFERRED /*DESC*/ /*DETACH*/ DUMPFILE DATA /*DATABASE*/ DEALLOCATE DEFERRED /*DESC*/ /*DETACH*/ DUMPFILE
/*EACH*/ END ENGINE ENUM EXCLUSIVE /*EXPLAIN*/ /*EACH*/ END ENGINE ENUM EXCLUSIVE /*EXPLAIN*/
/*EACH*/ END ENUM EXCLUSIVE /*EXPLAIN*/
FIRST FLUSH /*FOR*/ FORMAT FIRST FLUSH /*FOR*/ FORMAT
GLOBAL GLOBAL
// TODO: IF is a reserved word and should not automatically convert into an identifer. // TODO: IF is a reserved word and should not automatically convert into an identifer.