• updated syntax highlighting and completion suggestions due to 5.5 additions

• improved "Format SQL" connection detection

3 files changed, 56 insertions, 5 deletions

diff --git a/Resources/Plists/CompletionTokens.plist b/Resources/Plists/CompletionTokens.plist
index 6d48e267..f089401d 100644
--- a/Resources/Plists/CompletionTokens.plist
+++ b/Resources/Plists/CompletionTokens.plist
@@ -60,6 +60,7 @@
 			<string>CASCADE</string>
 			<string>CASCADED</string>
 			<string>CASE</string>
+			<string>CATALOG_NAME</string>
 			<string>CHAIN</string>
 			<string>CHANGE</string>
 			<string>CHANGED</string>
@@ -72,6 +73,7 @@
 			<string>CHECKSUM</string>
 			<string>CHECKSUM TABLE</string>
 			<string>CIPHER</string>
+			<string>CLASS_ORIGIN</string>
 			<string>CLIENT</string>
 			<string>CLOSE</string>
 			<string>COALESCE</string>
@@ -79,6 +81,7 @@
 			<string>COLLATE</string>
 			<string>COLLATION</string>
 			<string>COLUMN</string>
+			<string>COLUMN_NAME</string>
 			<string>COLUMNS</string>
 			<string>COLUMN_FORMAT</string>
 			<string>COMMENT</string>
@@ -92,10 +95,14 @@
 			<string>CONNECTION</string>
 			<string>CONSISTENT</string>
 			<string>CONSTRAINT</string>
+			<string>CONSTRAINT_CATALOG</string>
+			<string>CONSTRAINT_NAME</string>
+			<string>CONSTRAINT_SCHEMA</string>
 			<string>CONTAINS</string>
 			<string>CONTINUE</string>
 			<string>CONTRIBUTORS</string>
 			<string>CONVERT</string>
+			<string>CURSOR_NAME</string>
 			<string>CREATE</string>
 			<string>CREATE DATABASE</string>
 			<string>CREATE EVENT</string>
@@ -104,6 +111,7 @@
 			<string>CREATE LOGFILE GROUP</string>
 			<string>CREATE PROCEDURE</string>
 			<string>CREATE SCHEMA</string>
+			<string>CREATE SERVER</string>
 			<string>CREATE TABLE</string>
 			<string>CREATE TABLESPACE</string>
 			<string>CREATE TRIGGER</string>
@@ -216,6 +224,7 @@
 			<string>FOR UPDATE</string>
 			<string>FORCE</string>
 			<string>FOREIGN</string>
+			<string>FOREIGN DATA WRAPPER</string>
 			<string>FOREIGN KEY</string>
 			<string>FOUND</string>
 			<string>FRAC_SECOND</string>
@@ -223,6 +232,7 @@
 			<string>FULL</string>
 			<string>FULLTEXT</string>
 			<string>FUNCTION</string>
+			<string>GENERAL</string>
 			<string>GEOMETRY</string>
 			<string>GEOMETRYCOLLECTION</string>
 			<string>GLOBAL</string>
@@ -235,6 +245,7 @@
 			<string>HAVING</string>
 			<string>HELP</string>
 			<string>HIGH_PRIORITY</string>
+			<string>HOST</string>
 			<string>HOSTS</string>
 			<string>HOUR</string>
 			<string>HOUR_MICROSECOND</string>
@@ -243,6 +254,7 @@
 			<string>IDENTIFIED</string>
 			<string>IF</string>
 			<string>IGNORE</string>
+			<string>IGNORE_SERVER_IDS</string>
 			<string>IMPORT</string>
 			<string>IN</string>
 			<string>INDEX</string>
@@ -315,6 +327,7 @@
 			<string>LOW_PRIORITY</string>
 			<string>MASTER</string>
 			<string>MASTER_CONNECT_RETRY</string>
+			<string>MASTER_HEARTBEAT_PERIOD</string>
 			<string>MASTER_HOST</string>
 			<string>MASTER_LOG_FILE</string>
 			<string>MASTER_LOG_POS</string>
@@ -342,6 +355,7 @@
 			<string>MEDIUMTEXT</string>
 			<string>MEMORY</string>
 			<string>MERGE</string>
+			<string>MESSAGE_TEXT</string>
 			<string>MICROSECOND</string>
 			<string>MIDDLEINT</string>
 			<string>MIGRATE</string>
@@ -358,6 +372,7 @@
 			<string>MULTIPOINT</string>
 			<string>MULTIPOLYGON</string>
 			<string>MUTEX</string>
+			<string>MYSQL_ERRNO</string>
 			<string>NAME</string>
 			<string>NAMES</string>
 			<string>NATIONAL</string>
@@ -394,6 +409,7 @@
 			<string>OUT</string>
 			<string>OUTER</string>
 			<string>OUTFILE</string>
+			<string>OWNER</string>
 			<string>PACK_KEYS</string>
 			<string>PARSER</string>
 			<string>PARTIAL</string>
@@ -406,6 +422,7 @@
 			<string>PLUGINS</string>
 			<string>POINT</string>
 			<string>POLYGON</string>
+			<string>PORT</string>
 			<string>PRECISION</string>
 			<string>PREPARE</string>
 			<string>PRESERVE</string>
@@ -453,6 +470,7 @@
 			<string>REQUIRE</string>
 			<string>RESET</string>
 			<string>RESET MASTER</string>
+			<string>RESIGNAL</string>
 			<string>RESTORE</string>
 			<string>RESTORE TABLE</string>
 			<string>RESTRICT</string>
@@ -475,6 +493,7 @@
 			<string>SCHEDULER</string>
 			<string>SCHEMA</string>
 			<string>SCHEMAS</string>
+			<string>SCHEMA_NAME</string>
 			<string>SECOND</string>
 			<string>SECOND_MICROSECOND</string>
 			<string>SECURITY</string>
@@ -484,6 +503,7 @@
 			<string>SEPARATOR</string>
 			<string>SERIAL</string>
 			<string>SERIALIZABLE</string>
+			<string>SERVER</string>
 			<string>SESSION</string>
 			<string>SET</string>
 			<string>SET GLOBAL</string>
@@ -541,11 +561,14 @@
 			<string>SHOW VARIABLES</string>
 			<string>SHOW WARNINGS</string>
 			<string>SHUTDOWN</string>
+			<string>SIGNAL</string>
 			<string>SIGNED</string>
 			<string>SIMPLE</string>
 			<string>SLAVE</string>
+			<string>SLOW</string>
 			<string>SMALLINT</string>
 			<string>SNAPSHOT</string>
+			<string>SOCKET</string>
 			<string>SOME</string>
 			<string>SONAME</string>
 			<string>SOUNDS</string>
@@ -591,6 +614,7 @@
 			<string>STRAIGHT_JOIN</string>
 			<string>STRING</string>
 			<string>SUBJECT</string>
+			<string>SUBCLASS_ORIGIN</string>
 			<string>SUBPARTITION</string>
 			<string>SUBPARTITIONS</string>
 			<string>SUPER</string>
@@ -598,6 +622,7 @@
 			<string>TABLE</string>
 			<string>TABLES</string>
 			<string>TABLESPACE</string>
+			<string>TABLE_NAME</string>
 			<string>TEMPORARY</string>
 			<string>TEMPTABLE</string>
 			<string>TERMINATED</string>
@@ -663,6 +688,7 @@
 			<string>WITH</string>
 			<string>WITH CONSISTENT SNAPSHOT</string>
 			<string>WORK</string>
+			<string>WRAPPER</string>
 			<string>WRITE</string>
 			<string>X509</string>
 			<string>XA</string>
diff --git a/SharedSupport/Default Bundles/Format SQL.spBundle/command.plist b/SharedSupport/Default Bundles/Format SQL.spBundle/command.plist
index c9458332..13e86145 100644
--- a/SharedSupport/Default Bundles/Format SQL.spBundle/command.plist
+++ b/SharedSupport/Default Bundles/Format SQL.spBundle/command.plist
@@ -17,7 +17,7 @@ if [ -z "$SQL" ]; then
 fi
 
 # check if connected to the internet and if server is up
-connected=$(/sbin/ping -t 5 -c 1 -on www.dpriver.com 2&gt; /dev/null | grep 'icmp' | wc -l)
+connected=$(/sbin/ping -t 8 -c 1 -on www.dpriver.com 2&gt; /dev/null | grep '69\.5\.11\.169' | wc -l)
 if [ $connected -eq "0" ]; then
 	echo "&lt;font color=red&gt;You are probably not connected to the internet or http://www.dpriver.com/ server is down.&lt;/font&gt;"
 	exit $SP_BUNDLE_EXIT_SHOW_AS_HTML_TOOLTIP
diff --git a/Source/SPEditorTokens.l b/Source/SPEditorTokens.l
index 3be705ce..7b19804a 100644
--- a/Source/SPEditorTokens.l
+++ b/Source/SPEditorTokens.l
@@ -56,9 +56,9 @@ ops		"+"|"-"|"*"|"/"
 word	[a-z_\.0-9À-ﾟ@]
 variable	@{1,2}[a-z_\.0-9À-ﾟ$]+
 nonword	[^a-z_0-9À-ﾟ#\n\t\r]
-keyworda	(G(R(OUP{s}BY|ANT(S)?)|E(T_FORMAT|OMETRY(COLLECTION)?)|LOBAL)|B(Y(TE)?|TREE|I(GINT|N(LOG|ARY)|T)|O(TH|OL(EAN)?)|E(GIN|TWEEN|FORE)|LOB|ACKUP{s}TABLE)|H(IGH_PRIORITY|O(STS|UR(_(MI(NUTE|CROSECOND)|SECOND))?)|ELP|A(SH|NDLER|VING))|C(R(OSS|EATE)|H(ECK(SUM)?|A(R(SET|ACTER)?|NGE(D)?|IN))|IPHER|O(M(M(IT(TED)?|ENT)|P(RESSED|LETION|ACT))|N(S(TRAINT|ISTENT)|NECTION|CURRENT|T(RIBUTORS|INUE|AINS)|DITION|VERT)|DE|L(UMN(_FORMAT)?|LATE)|ALESCE{s}PARTITION)|U(R(RENT_(TIME(STAMP)?|DATE|USER)|SOR)|BE)|L(IENT|OSE)|A(S(CADE(D)?|E)|CHE{s}INDEX|LL))|I(GNORE|MPORT{s}TABLESPACE|S(SUER|OLATION)?|N(S(TALL({s}PLUGIN)?|E(RT(_METHOD)?|NSITIVE))|N(O(BASE|DB)|ER)|T(1|2|8|3|O({s}(DUMP|OUT)FILE)?|4|E(RVAL|GER))?|ITIAL_SIZE|OUT|DEX(ES)?|VOKER|FILE)?|TERATE|O_THREAD|DENTIFIED|F)|D(ROP|YNAMIC|I(RECTORY|S(CARD{s}TABLESPACE|TINCT(ROW)?|K|ABLE{s}KEYS)|V)|O(UBLE)?|U(MPFILE|PLICATE|AL)|E(S(C(RIBE)?|_KEY_FILE)|C(IMAL|LARE)?|TERMINISTIC|F(INER|AULT)|L(ETE|AY(_KEY_WRITE|ED))|ALLOCATE)|A(Y(_(MI(NUTE|CROSECOND)|SECOND|HOUR))?|T(E(TIME)?|A(BASE(S)?|FILE)?)))|JOIN|E(RRORS|X(TEN(T_SIZE|DED)|I(STS|T)|P(LAIN|ANSION)|ECUTE)|SCAPE(D{s}BY)?|N(GINE(S)?|CLOSED{s}BY|D(S)?|UM|ABLE{s}KEYS)|VE(RY|NT)|LSE(IF)?|ACH)|K(ILL({s}(CONNECTION|QUERY))?|EY(S|_BLOCK_SIZE)?)|F(R(OM|AC_SECOND)|I(RST|XED|LE)|O(R(CE|EIGN)?|UND)|U(NCTION|LL(TEXT)?)|ETCH|L(OAT(8|4)?|USH)|A(ST|LSE))|A(G(GREGATE|AINST)|S(C(II)?|ENSITIVE)?|N(Y|D|ALYZE)|C(CESSIBLE|TION)|T|DD|UT(HORS|O(_INCREMENT|EXTEND_SIZE))|VG(_ROW_LENGTH)?|FTER|L(GORITHM|TER|L)))
-keywordl	(R(TREE|IGHT|O(UTINE|W(S|_FORMAT)?|LL(BACK|UP))|E(GEXP|MOVE{s}PARTITIONING|BUILD{s}PARTITION|S(T(RICT|ORE{s}TABLE)|UME|ET)|NAME|COVER|TURN(S)?|ORGANIZE{s}PARTITION|D(O(_BUFFER_SIZE|FILE)|UNDANT)|P(EAT(ABLE)?|L(ICATION|ACE)|AIR)|VOKE|QUIRE|FERENCES|L(OAD|EASE|AY_(THREAD|LOG_(POS|FILE)))|A(D(S|_(ONLY|WRITE))?|L))|LIKE|ANGE)|M(I(GRATE|N(_ROWS|UTE(_(MICROSECOND|SECOND))?)|CROSECOND|DDLEINT)|O(NTH|D(IF(Y|IES)|E)?)|U(TEX|LTI(PO(INT|LYGON)|LINESTRING))|E(RGE|MORY|DIUM(BLOB|TEXT|INT)?)|A(X(_(ROWS|SIZE|CONNECTIONS_PER_HOUR|U(SER_CONNECTIONS|PDATES_PER_HOUR)|QUERIES_PER_HOUR)|VALUE)|STER(_(S(SL(_(C(IPHER|ERT|A(PATH)?)|VERIFY_SERVER_CERT|KEY))?|ERVER_ID)|HOST|CONNECT_RETRY|USER|P(ORT|ASSWORD)|LOG_(POS|FILE)))?|TCH))|N(CHAR|O(NE|_W(RITE_TO_BINLOG|AIT)|T|DEGROUP)?|DB(CLUSTER)?|U(MERIC|LL)|E(XT|W)|VARCHAR|A(ME(S)?|T(IONAL|URAL)))|O(R(DER{s}BY)?|N({s}(DUPLICATE{s}KEY{s}UPDATE)?|E(_SHOT)?|LINE)|UT(ER|FILE)?|P(TI(MIZE|ON(S|ALLY)?)|EN)|FF(SET|LINE)|LD_PASSWORD)|P(R(I(MARY|VILEGES)|OCE(SS|DURE{s}(ANALYSE)?)|E(SERVE|CISION|PARE|V))|HASE|O(INT|LYGON)|URGE|A(R(SER|TI(TION(S|ING)?|AL))|SSWORD|CK_KEYS))|QU(ICK|ERY|ARTER)|L(I(MIT|ST|NE(S(TRING)?|AR)|KE)|O(G(S|FILE({s}GROUP))|NG(BLOB|TEXT)?|C(K(S)?|AL(TIME(STAMP)?)?)|OP|W_PRIORITY|AD{s}(DATA|INDEX{s}INTO{s}CACHE|XML))|E(SS|VEL|FT|A(DING|VE(S)?))|A(ST|NGUAGE)))
-keywords	(X(OR|509|A)|S(MALLINT|SL|H(OW({s}(E(NGINE(S)?|RRORS)|M(ASTER|UTEX)|BINLOG|GRANTS|INNODB|P(RIVILEGES|ROFILE(S)?|ROCEDURE{s}CODE)|SLAVE{s}(HOSTS|STATUS)|TRIGGERS|VARIABLES|WARNINGS|(FULL{s})?PROCESSLIST|FIELDS|PLUGIN(S)?|STORAGE{s}ENGINES|TABLE{s}TYPES|CO(LUMNS|LLATION)|BINLOG{s}EVENTS))?|UTDOWN|ARE)|NAPSHOT|CHE(MA(S)?|DULE(R)?)|T(R(ING|AIGHT_JOIN)|O(RAGE|P)|A(RT(S|ING{s}BY)?|TUS))|I(GNED|MPLE)|O(ME|NAME|UNDS)|U(B(JECT|PARTITION(S)?)|SPEND|PER)|P(ECIFIC|ATIAL)|E(RIAL(IZABLE)?|SSION|NSITIVE|C(OND(_MICROSECOND)?|URITY)|T({s}(PASSWORD|NAMES|ONE_SHOT))?|PARATOR|LECT)|QL(STATE|_(MAX_JOIN_SIZE|B(IG_(RESULT|SELECTS|TABLES)|UFFER_RESULT)|S(MALL_RESULT|ELECT_LIMIT|LAVE_SKIP_COUNTER|AFE_UPDATES)|NO_CACHE|CA(CHE|LC_FOUND_ROWS)|T(SI_(M(INUTE|ONTH)|SECOND|HOUR|YEAR|DAY|QUARTER|FRAC_SECOND|WEEK)|HREAD)|QUOTE_SHOW_CREATE|WARNINGS|LO(G_(BIN|OFF|UPDATE)|W_PRIORITY_UPDATES)|AUTO_IS_NULL)|EXCEPTION|WARNING)?|LAVE|AVEPOINT)|YEAR(_MONTH)?|T(R(IGGER(S)?|U(NCATE|E)|A(NSACTION|ILING))|H(EN|AN)|YPE|I(ME(STAMP(DIFF|ADD)?)?|NY(BLOB|TEXT|INT))|O|E(RMINATED{s}BY|XT|MP(TABLE|ORARY))|ABLE(S(PACE)?)?)|ZEROFILL|U(S(ING|E(R(_RESOURCES)?|_FRM)?|AGE)|N(SIGNED|COMMITTED|TIL|I(NSTALL({s}PLUGIN)?|CODE|ON|QUE)|D(O(_BUFFER_SIZE|FILE)?|EFINED)|KNOWN|LOCK)|TC_(TIME(STAMP)?|DATE)|P(GRADE|DATE))|V(IEW|A(R(BINARY|YING|CHAR(ACTER)?|IABLES)|LUE(S)?))|W(RITE|H(ILE|E(RE|N))|ITH({s}PARSER)?|ORK|EEK|A(RNINGS|IT)))
+keyworda	(G(R(OUP{s}BY|ANT(S)?)|E(NERAL|T_FORMAT|OMETRY(COLLECTION)?)|LOBAL)|B(Y(TE)?|TREE|I(GINT|N(LOG|ARY)|T)|O(TH|OL(EAN)?)|E(GIN|TWEEN|FORE)|LOB|ACKUP{s}TABLE)|H(IGH_PRIORITY|O(ST(S)?|UR(_(MI(NUTE|CROSECOND)|SECOND))?)|ELP|A(SH|NDLER|VING))|C(R(OSS|EATE)|H(ECK(SUM)?|A(R(SET|ACTER)?|NGE(D)?|IN))|IPHER|O(M(M(IT(TED)?|ENT)|P(RESSED|LETION|ACT))|N(S(TRAINT(_(SCHEMA|NAME|CATALOG))?|ISTENT)|NECTION|CURRENT|T(RIBUTORS|INUE|AINS)|DITION|VERT)|DE|L(UMN(S|_(NAME|FORMAT))?|LATE)|ALESCE{s}PARTITION)|U(R(RENT_(TIME(STAMP)?|DATE|USER)|SOR(_NAME)?)|BE)|L(IENT|OSE|ASS_ORIGIN)|A(S(CADE(D)?|E)|CHE{s}INDEX|TALOG_NAME|LL))|I(GNORE(_SERVER_IDS)?|MPORT{s}TABLESPACE|S(SUER|OLATION)?|N(S(TALL({s}PLUGIN)?|E(RT(_METHOD)?|NSITIVE))|N(O(BASE|DB)|ER)|T(1|2|8|3|O({s}(DUMP|OUT)FILE)?|4|E(RVAL|GER))?|ITIAL_SIZE|OUT|DEX(ES)?|VOKER|FILE)?|TERATE|O_THREAD|DENTIFIED|F)|D(ROP|YNAMIC|I(RECTORY|S(CARD{s}TABLESPACE|TINCT(ROW)?|K|ABLE{s}KEYS)|V)|O(UBLE)?|U(MPFILE|PLICATE|AL)|E(S(C(RIBE)?|_KEY_FILE)|C(IMAL|LARE)?|TERMINISTIC|F(INER|AULT)|L(ETE|AY(_KEY_WRITE|ED))|ALLOCATE)|A(Y(_(MI(NUTE|CROSECOND)|SECOND|HOUR))?|T(E(TIME)?|A(BASE(S)?|FILE)?)))|JOIN|E(RRORS|X(TEN(T_SIZE|DED)|I(STS|T)|P(LAIN|ANSION)|ECUTE)|SCAPE(D{s}BY)?|N(GINE(S)?|CLOSED{s}BY|D(S)?|UM|ABLE{s}KEYS)|VE(RY|NT)|LSE(IF)?|ACH)|K(ILL({s}(CONNECTION|QUERY))?|EY(S|_BLOCK_SIZE)?)|F(R(OM|AC_SECOND)|I(RST|XED|LE)|O(R(CE|EIGN)?|UND)|U(NCTION|LL(TEXT)?)|ETCH|L(OAT(8|4)?|USH)|A(ST|LSE))|A(G(GREGATE|AINST)|S(C(II)?|ENSITIVE)?|N(Y|D|ALYZE)|C(CESSIBLE|TION)|T|DD|UT(HORS|O(_INCREMENT|EXTEND_SIZE))|VG(_ROW_LENGTH)?|FTER|L(GORITHM|TER|L)))
+keywordl	(R(TREE|IGHT|O(UTINE|W(S|_FORMAT)?|LL(BACK|UP))|E(GEXP|MOVE{s}PARTITIONING|BUILD{s}PARTITION|S(T(RICT|ORE{s}TABLE)|IGNAL|UME|ET)|NAME|COVER|TURN(S)?|ORGANIZE{s}PARTITION|D(O(_BUFFER_SIZE|FILE)|UNDANT)|P(EAT(ABLE)?|L(ICATION|ACE)|AIR)|VOKE|QUIRE|FERENCES|L(OAD|EASE|AY_(THREAD|LOG_(POS|FILE)))|A(D(S|_(ONLY|WRITE))?|L))|LIKE|ANGE)|M(YSQL_ERRNO|I(GRATE|N(_ROWS|UTE(_(MICROSECOND|SECOND))?)|CROSECOND|DDLEINT)|O(NTH|D(IF(Y|IES)|E)?)|U(TEX|LTI(PO(INT|LYGON)|LINESTRING))|E(RGE|MORY|SSAGE_TEXT|DIUM(BLOB|TEXT|INT)?)|A(X(_(ROWS|SIZE|CONNECTIONS_PER_HOUR|U(SER_CONNECTIONS|PDATES_PER_HOUR)|QUERIES_PER_HOUR)|VALUE)|STER(_(S(SL(_(C(IPHER|ERT|A(PATH)?)|VERIFY_SERVER_CERT|KEY))?|ERVER_ID)|H(OST|EARTBEAT_PERIOD)|CONNECT_RETRY|USER|P(ORT|ASSWORD)|LOG_(POS|FILE)))?|TCH))|N(CHAR|O(NE|_W(RITE_TO_BINLOG|AIT)|T|DEGROUP)?|DB(CLUSTER)?|U(MERIC|LL)|E(XT|W)|VARCHAR|A(ME(S)?|T(IONAL|URAL)))|O(R(DER{s}BY)?|N({s}(DUPLICATE{s}KEY{s}UPDATE)?|E(_SHOT)?|LINE)|UT(ER|FILE)?|P(TI(MIZE|ON(S|ALLY)?)|EN)|FF(SET|LINE)|WNER|LD_PASSWORD)|P(R(I(MARY|VILEGES)|OCE(SS|DURE{s}(ANALYSE)?)|E(SERVE|CISION|PARE|V))|HASE|O(RT|INT|LYGON)|URGE|A(R(SER|TI(TION(S|ING)?|AL))|SSWORD|CK_KEYS))|QU(ICK|ERY|ARTER)|L(I(MIT|ST|NE(S(TRING)?|AR)|KE)|O(G(S|FILE({s}GROUP))|NG(BLOB|TEXT)?|C(K(S)?|AL(TIME(STAMP)?)?)|OP|W_PRIORITY|AD{s}(DATA|INDEX{s}INTO{s}CACHE|XML))|E(SS|VEL|FT|A(DING|VE(S)?))|A(ST|NGUAGE)))
+keywords	(X(OR|509|A)|S(MALLINT|SL|H(OW({s}(E(NGINE(S)?|RRORS)|M(ASTER|UTEX)|BINLOG|GRANTS|INNODB|P(RIVILEGES|ROFILE(S)?|ROCEDURE{s}CODE)|SLAVE{s}(HOSTS|STATUS)|TRIGGERS|VARIABLES|WARNINGS|(FULL{s})?PROCESSLIST|FIELDS|PLUGIN(S)?|STORAGE{s}ENGINES|TABLE{s}TYPES|CO(LUMNS|LLATION)|BINLOG{s}EVENTS))?|UTDOWN|ARE)|NAPSHOT|CHE(MA(S|_NAME)?|DULE(R)?)|T(R(ING|AIGHT_JOIN)|O(RAGE|P)|A(RT(S|ING{s}BY)?|TUS))|I(GN(ED|AL)|MPLE)|O(ME|NAME|CKET|UNDS)|U(B(CLASS_ORIGIN|JECT|PARTITION(S)?)|SPEND|PER)|P(ECIFIC|ATIAL)|E(R(IAL(IZABLE)?|VER)|SSION|NSITIVE|C(OND(_MICROSECOND)?|URITY)|T({s}(PASSWORD|NAMES|ONE_SHOT))?|PARATOR|LECT)|QL(STATE|_(MAX_JOIN_SIZE|B(IG_(RESULT|SELECTS|TABLES)|UFFER_RESULT)|S(MALL_RESULT|ELECT_LIMIT|LAVE_SKIP_COUNTER|AFE_UPDATES)|NO_CACHE|CA(CHE|LC_FOUND_ROWS)|T(SI_(M(INUTE|ONTH)|SECOND|HOUR|YEAR|DAY|QUARTER|FRAC_SECOND|WEEK)|HREAD)|QUOTE_SHOW_CREATE|WARNINGS|LO(G_(BIN|OFF|UPDATE)|W_PRIORITY_UPDATES)|AUTO_IS_NULL)|EXCEPTION|WARNING)?|L(OW|AVE)|AVEPOINT)|YEAR(_MONTH)?|T(R(IGGER(S)?|U(NCATE|E)|A(NSACTION|ILING))|H(EN|AN)|YPE|I(ME(STAMP(DIFF|ADD)?)?|NY(BLOB|TEXT|INT))|O|E(RMINATED{s}BY|XT|MP(TABLE|ORARY))|ABLE(S(PACE)?|_NAME)?)|ZEROFILL|U(S(ING|E(R(_RESOURCES)?|_FRM)?|AGE)|N(SIGNED|COMMITTED|TIL|I(NSTALL({s}PLUGIN)?|CODE|ON|QUE)|D(O(_BUFFER_SIZE|FILE)?|EFINED)|KNOWN|LOCK)|TC_(TIME(STAMP)?|DATE)|P(GRADE|DATE))|V(IEW|A(R(BINARY|YING|CHAR(ACTER)?|IABLES)|LUE(S)?))|W(R(ITE|APPER)|H(ILE|E(RE|N))|ITH({s}PARSER)?|ORK|EEK|A(RNINGS|IT)))
 
 
 %x comment
@@ -217,6 +217,7 @@ CALL
 CASCADE
 CASCADED
 CASE
+CATALOG_NAME
 CHAIN
 CHANGE
 CHANGED
@@ -226,6 +227,7 @@ CHARSET
 CHECK
 CHECKSUM
 CIPHER
+CLASS_ORIGIN
 CLIENT
 CLOSE
 COALESCE{s}PARTITION
@@ -233,6 +235,8 @@ CODE
 COLLATE
 COLUMN
 COLUMN_FORMAT
+COLUMN_NAME
+COLUMNS
 COMMENT
 COMMIT
 COMMITTED
@@ -244,6 +248,9 @@ CONDITION
 CONNECTION
 CONSISTENT
 CONSTRAINT
+CONSTRAINT_CATALOG
+CONSTRAINT_NAME
+CONSTRAINT_SCHEMA
 CONTAINS
 CONTINUE
 CONTRIBUTORS
@@ -256,6 +263,7 @@ CURRENT_TIME
 CURRENT_TIMESTAMP
 CURRENT_USER
 CURSOR
+CURSOR_NAME
 DATA
 DATABASE
 DATABASES
@@ -335,6 +343,7 @@ FROM
 FULL
 FULLTEXT
 FUNCTION
+GENERAL
 GEOMETRY
 GEOMETRYCOLLECTION
 GET_FORMAT
@@ -347,6 +356,7 @@ HASH
 HAVING
 HELP
 HIGH_PRIORITY
+HOST
 HOSTS
 HOUR
 HOUR_MICROSECOND
@@ -355,6 +365,7 @@ HOUR_SECOND
 IDENTIFIED
 IF
 IGNORE
+IGNORE_SERVER_IDS
 IMPORT{s}TABLESPACE
 IN
 INDEX
@@ -418,6 +429,7 @@ LOOP
 LOW_PRIORITY
 MASTER
 MASTER_CONNECT_RETRY
+MASTER_HEARTBEAT_PERIOD
 MASTER_HOST
 MASTER_LOG_FILE
 MASTER_LOG_POS
@@ -446,6 +458,7 @@ MEDIUMINT
 MEDIUMTEXT
 MEMORY
 MERGE
+MESSAGE_TEXT
 MICROSECOND
 MIDDLEINT
 MIGRATE
@@ -462,6 +475,7 @@ MULTILINESTRING
 MULTIPOINT
 MULTIPOLYGON
 MUTEX
+MYSQL_ERRNO
 NAME
 NAMES
 NATIONAL
@@ -490,13 +504,14 @@ ON{s}(DUPLICATE{s}KEY{s}UPDATE)?
 OPEN
 OPTIMIZE
 OPTION
-OPTIONS
 OPTIONALLY
+OPTIONS
 OR
 ORDER{s}BY
 OUT
 OUTER
 OUTFILE
+OWNER
 PACK_KEYS
 PARSER
 PARTIAL
@@ -507,6 +522,7 @@ PASSWORD
 PHASE
 POINT
 POLYGON
+PORT
 PRECISION
 PREPARE
 PRESERVE
@@ -547,6 +563,7 @@ REPLACE
 REPLICATION
 REQUIRE
 RESET
+RESIGNAL
 RESTORE{s}TABLE
 RESTRICT
 RESUME
@@ -567,6 +584,7 @@ SCHEDULE
 SCHEDULER
 SCHEMA
 SCHEMAS
+SCHEMA_NAME
 SECOND
 SECOND_MICROSECOND
 SECURITY
@@ -575,16 +593,20 @@ SENSITIVE
 SEPARATOR
 SERIAL
 SERIALIZABLE
+SERVER
 SESSION
 SET({s}(PASSWORD|NAMES|ONE_SHOT))?
 SHARE
 SHOW({s}(E(NGINE(S)?|RRORS)|M(ASTER|UTEX)|BINLOG|GRANTS|INNODB|P(RIVILEGES|ROFILE(S)?|ROCEDURE{s}CODE)|SLAVE{s}(HOSTS|STATUS)|TRIGGERS|VARIABLES|WARNINGS|(FULL{s})?PROCESSLIST|FIELDS|PLUGIN(S)?|STORAGE{s}ENGINES|TABLE{s}TYPES|CO(LUMNS|LLATION)|BINLOG{s}EVENTS))?
 SHUTDOWN
+SIGNAL
 SIGNED
 SIMPLE
 SLAVE
+SLOW
 SMALLINT
 SNAPSHOT
+SOCKET
 SOME
 SONAME
 SOUNDS
@@ -632,6 +654,7 @@ STOP
 STORAGE
 STRAIGHT_JOIN
 STRING
+SUBCLASS_ORIGIN
 SUBJECT
 SUBPARTITION
 SUBPARTITIONS
@@ -640,6 +663,7 @@ SUSPEND
 TABLE
 TABLES
 TABLESPACE
+TABLE_NAME
 TEMPORARY
 TEMPTABLE
 TERMINATED{s}BY
@@ -701,6 +725,7 @@ WHERE
 WHILE
 WITH({s}PARSER)?
 WORK
+WRAPPER
 WRITE
 X509
 XA