diff --git a/mysql-test/r/parser_bug21114_innodb.result b/mysql-test/r/parser_bug21114_innodb.result
index d3ceda38979..e39b63f571d 100644
--- a/mysql-test/r/parser_bug21114_innodb.result
+++ b/mysql-test/r/parser_bug21114_innodb.result
@@ -1,8 +1,8 @@
-drop table if exists ABS;
+drop table if exists abs;
 drop table if exists bug21114_child;
-SHOW CREATE TABLE ABS;
+SHOW CREATE TABLE abs;
 Table	Create Table
-ABS	CREATE TABLE `ABS` (
+abs	CREATE TABLE `abs` (
   `col1` int(11) NOT NULL,
   `col2` int(11) NOT NULL,
   `col3` varchar(10) DEFAULT NULL,
@@ -18,16 +18,16 @@ bug21114_child	CREATE TABLE `bug21114_child` (
   `fk_col4` int(11) NOT NULL,
   KEY `fk_fct` (`fk_col1`,`fk_col2`),
   KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ABS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ABS` (`col1`, `col2`)
+  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `abs` (`col1`, `col2`),
+  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `abs` (`col1`, `col2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
-DROP TABLE ABS;
-drop table if exists FIELD;
+DROP TABLE abs;
+drop table if exists field;
 drop table if exists bug21114_child;
-SHOW CREATE TABLE FIELD;
+SHOW CREATE TABLE field;
 Table	Create Table
-FIELD	CREATE TABLE `FIELD` (
+field	CREATE TABLE `field` (
   `col1` int(11) NOT NULL,
   `col2` int(11) NOT NULL,
   `col3` varchar(10) DEFAULT NULL,
@@ -43,16 +43,16 @@ bug21114_child	CREATE TABLE `bug21114_child` (
   `fk_col4` int(11) NOT NULL,
   KEY `fk_fct` (`fk_col1`,`fk_col2`),
   KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FIELD` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FIELD` (`col1`, `col2`)
+  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `field` (`col1`, `col2`),
+  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `field` (`col1`, `col2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
-DROP TABLE FIELD;
-drop table if exists FORMAT;
+DROP TABLE field;
+drop table if exists format;
 drop table if exists bug21114_child;
-SHOW CREATE TABLE FORMAT;
+SHOW CREATE TABLE format;
 Table	Create Table
-FORMAT	CREATE TABLE `FORMAT` (
+format	CREATE TABLE `format` (
   `col1` int(11) NOT NULL,
   `col2` int(11) NOT NULL,
   `col3` varchar(10) DEFAULT NULL,
@@ -68,800 +68,800 @@ bug21114_child	CREATE TABLE `bug21114_child` (
   `fk_col4` int(11) NOT NULL,
   KEY `fk_fct` (`fk_col1`,`fk_col2`),
   KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FORMAT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FORMAT` (`col1`, `col2`)
+  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `format` (`col1`, `col2`),
+  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `format` (`col1`, `col2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
-DROP TABLE FORMAT;
-drop table if exists ACOS;
+DROP TABLE format;
+drop table if exists acos;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ACOS;
-drop table if exists ADDDATE;
+DROP TABLE acos;
+drop table if exists adddate;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ADDDATE;
-drop table if exists ADDTIME;
+DROP TABLE adddate;
+drop table if exists addtime;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ADDTIME;
-drop table if exists AES_DECRYPT;
+DROP TABLE addtime;
+drop table if exists aes_decrypt;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE AES_DECRYPT;
-drop table if exists AES_ENCRYPT;
+DROP TABLE aes_decrypt;
+drop table if exists aes_encrypt;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE AES_ENCRYPT;
-drop table if exists AREA;
+DROP TABLE aes_encrypt;
+drop table if exists area;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE AREA;
-drop table if exists ASBINARY;
+DROP TABLE area;
+drop table if exists asbinary;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ASBINARY;
-drop table if exists ASIN;
+DROP TABLE asbinary;
+drop table if exists asin;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ASIN;
-drop table if exists ASTEXT;
+DROP TABLE asin;
+drop table if exists astext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ASTEXT;
-drop table if exists ASWKB;
+DROP TABLE astext;
+drop table if exists aswkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ASWKB;
-drop table if exists ASWKT;
+DROP TABLE aswkb;
+drop table if exists aswkt;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ASWKT;
-drop table if exists ATAN;
+DROP TABLE aswkt;
+drop table if exists atan;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ATAN;
-drop table if exists ATAN2;
+DROP TABLE atan;
+drop table if exists atan2;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ATAN2;
-drop table if exists BENCHMARK;
+DROP TABLE atan2;
+drop table if exists benchmark;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE BENCHMARK;
-drop table if exists BIN;
+DROP TABLE benchmark;
+drop table if exists bin;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE BIN;
-drop table if exists BIT_COUNT;
+DROP TABLE bin;
+drop table if exists bit_count;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE BIT_COUNT;
-drop table if exists BIT_LENGTH;
+DROP TABLE bit_count;
+drop table if exists bit_length;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE BIT_LENGTH;
-drop table if exists CEIL;
+DROP TABLE bit_length;
+drop table if exists ceil;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CEIL;
-drop table if exists CEILING;
+DROP TABLE ceil;
+drop table if exists ceiling;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CEILING;
-drop table if exists CENTROID;
+DROP TABLE ceiling;
+drop table if exists centroid;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CENTROID;
-drop table if exists CHARACTER_LENGTH;
+DROP TABLE centroid;
+drop table if exists character_length;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CHARACTER_LENGTH;
-drop table if exists CHAR_LENGTH;
+DROP TABLE character_length;
+drop table if exists char_length;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CHAR_LENGTH;
-drop table if exists COERCIBILITY;
+DROP TABLE char_length;
+drop table if exists coercibility;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE COERCIBILITY;
-drop table if exists COMPRESS;
+DROP TABLE coercibility;
+drop table if exists compress;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE COMPRESS;
-drop table if exists CONCAT;
+DROP TABLE compress;
+drop table if exists concat;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CONCAT;
-drop table if exists CONCAT_WS;
+DROP TABLE concat;
+drop table if exists concat_ws;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CONCAT_WS;
-drop table if exists CONNECTION_ID;
+DROP TABLE concat_ws;
+drop table if exists connection_id;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CONNECTION_ID;
-drop table if exists CONV;
+DROP TABLE connection_id;
+drop table if exists conv;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CONV;
-drop table if exists CONVERT_TZ;
+DROP TABLE conv;
+drop table if exists convert_tz;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CONVERT_TZ;
-drop table if exists COS;
+DROP TABLE convert_tz;
+drop table if exists cos;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE COS;
-drop table if exists COT;
+DROP TABLE cos;
+drop table if exists cot;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE COT;
-drop table if exists CRC32;
+DROP TABLE cot;
+drop table if exists crc32;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CRC32;
-drop table if exists CROSSES;
+DROP TABLE crc32;
+drop table if exists crosses;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE CROSSES;
-drop table if exists DATEDIFF;
+DROP TABLE crosses;
+drop table if exists datediff;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DATEDIFF;
-drop table if exists DATE_FORMAT;
+DROP TABLE datediff;
+drop table if exists date_format;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DATE_FORMAT;
-drop table if exists DAYNAME;
+DROP TABLE date_format;
+drop table if exists dayname;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DAYNAME;
-drop table if exists DAYOFMONTH;
+DROP TABLE dayname;
+drop table if exists dayofmonth;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DAYOFMONTH;
-drop table if exists DAYOFWEEK;
+DROP TABLE dayofmonth;
+drop table if exists dayofweek;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DAYOFWEEK;
-drop table if exists DAYOFYEAR;
+DROP TABLE dayofweek;
+drop table if exists dayofyear;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DAYOFYEAR;
-drop table if exists DECODE;
+DROP TABLE dayofyear;
+drop table if exists decode;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DECODE;
-drop table if exists DEGREES;
+DROP TABLE decode;
+drop table if exists degrees;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DEGREES;
-drop table if exists DES_DECRYPT;
+DROP TABLE degrees;
+drop table if exists des_decrypt;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DES_DECRYPT;
-drop table if exists DES_ENCRYPT;
+DROP TABLE des_decrypt;
+drop table if exists des_encrypt;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DES_ENCRYPT;
-drop table if exists DIMENSION;
+DROP TABLE des_encrypt;
+drop table if exists dimension;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DIMENSION;
-drop table if exists DISJOINT;
+DROP TABLE dimension;
+drop table if exists disjoint;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE DISJOINT;
-drop table if exists ELT;
+DROP TABLE disjoint;
+drop table if exists elt;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ELT;
-drop table if exists ENCODE;
+DROP TABLE elt;
+drop table if exists encode;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ENCODE;
-drop table if exists ENCRYPT;
+DROP TABLE encode;
+drop table if exists encrypt;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ENCRYPT;
-drop table if exists ENDPOINT;
+DROP TABLE encrypt;
+drop table if exists endpoint;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ENDPOINT;
-drop table if exists ENVELOPE;
+DROP TABLE endpoint;
+drop table if exists envelope;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ENVELOPE;
-drop table if exists EQUALS;
+DROP TABLE envelope;
+drop table if exists equals;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE EQUALS;
-drop table if exists EXP;
+DROP TABLE equals;
+drop table if exists exp;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE EXP;
-drop table if exists EXPORT_SET;
+DROP TABLE exp;
+drop table if exists export_set;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE EXPORT_SET;
-drop table if exists EXTERIORRING;
+DROP TABLE export_set;
+drop table if exists exteriorring;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE EXTERIORRING;
-drop table if exists EXTRACTVALUE;
+DROP TABLE exteriorring;
+drop table if exists extractvalue;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE EXTRACTVALUE;
-drop table if exists FIND_IN_SET;
+DROP TABLE extractvalue;
+drop table if exists find_in_set;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE FIND_IN_SET;
-drop table if exists FLOOR;
+DROP TABLE find_in_set;
+drop table if exists floor;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE FLOOR;
-drop table if exists FOUND_ROWS;
+DROP TABLE floor;
+drop table if exists found_rows;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE FOUND_ROWS;
-drop table if exists FROM_DAYS;
+DROP TABLE found_rows;
+drop table if exists from_days;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE FROM_DAYS;
-drop table if exists FROM_UNIXTIME;
+DROP TABLE from_days;
+drop table if exists from_unixtime;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE FROM_UNIXTIME;
-drop table if exists GEOMCOLLFROMTEXT;
+DROP TABLE from_unixtime;
+drop table if exists geomcollfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GEOMCOLLFROMTEXT;
-drop table if exists GEOMCOLLFROMWKB;
+DROP TABLE geomcollfromtext;
+drop table if exists geomcollfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GEOMCOLLFROMWKB;
-drop table if exists GEOMETRYCOLLECTIONFROMTEXT;
+DROP TABLE geomcollfromwkb;
+drop table if exists geometrycollectionfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GEOMETRYCOLLECTIONFROMTEXT;
-drop table if exists GEOMETRYCOLLECTIONFROMWKB;
+DROP TABLE geometrycollectionfromtext;
+drop table if exists geometrycollectionfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GEOMETRYCOLLECTIONFROMWKB;
-drop table if exists GEOMETRYFROMTEXT;
+DROP TABLE geometrycollectionfromwkb;
+drop table if exists geometryfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GEOMETRYFROMTEXT;
-drop table if exists GEOMETRYFROMWKB;
+DROP TABLE geometryfromtext;
+drop table if exists geometryfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GEOMETRYFROMWKB;
-drop table if exists GEOMETRYN;
+DROP TABLE geometryfromwkb;
+drop table if exists geometryn;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GEOMETRYN;
-drop table if exists GEOMETRYTYPE;
+DROP TABLE geometryn;
+drop table if exists geometrytype;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GEOMETRYTYPE;
-drop table if exists GEOMFROMTEXT;
+DROP TABLE geometrytype;
+drop table if exists geomfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GEOMFROMTEXT;
-drop table if exists GEOMFROMWKB;
+DROP TABLE geomfromtext;
+drop table if exists geomfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GEOMFROMWKB;
-drop table if exists GET_LOCK;
+DROP TABLE geomfromwkb;
+drop table if exists get_lock;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GET_LOCK;
-drop table if exists GLENGTH;
+DROP TABLE get_lock;
+drop table if exists glength;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GLENGTH;
-drop table if exists GREATEST;
+DROP TABLE glength;
+drop table if exists greatest;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE GREATEST;
-drop table if exists HEX;
+DROP TABLE greatest;
+drop table if exists hex;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE HEX;
-drop table if exists IFNULL;
+DROP TABLE hex;
+drop table if exists ifnull;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE IFNULL;
-drop table if exists INET_ATON;
+DROP TABLE ifnull;
+drop table if exists inet_aton;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE INET_ATON;
-drop table if exists INET_NTOA;
+DROP TABLE inet_aton;
+drop table if exists inet_ntoa;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE INET_NTOA;
-drop table if exists INSTR;
+DROP TABLE inet_ntoa;
+drop table if exists instr;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE INSTR;
-drop table if exists INTERIORRINGN;
+DROP TABLE instr;
+drop table if exists interiorringn;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE INTERIORRINGN;
-drop table if exists INTERSECTS;
+DROP TABLE interiorringn;
+drop table if exists intersects;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE INTERSECTS;
-drop table if exists ISCLOSED;
+DROP TABLE intersects;
+drop table if exists isclosed;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ISCLOSED;
-drop table if exists ISEMPTY;
+DROP TABLE isclosed;
+drop table if exists isempty;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ISEMPTY;
-drop table if exists ISNULL;
+DROP TABLE isempty;
+drop table if exists isnull;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ISNULL;
-drop table if exists ISSIMPLE;
+DROP TABLE isnull;
+drop table if exists issimple;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ISSIMPLE;
-drop table if exists IS_FREE_LOCK;
+DROP TABLE issimple;
+drop table if exists is_free_lock;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE IS_FREE_LOCK;
-drop table if exists IS_USED_LOCK;
+DROP TABLE is_free_lock;
+drop table if exists is_used_lock;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE IS_USED_LOCK;
-drop table if exists LAST_DAY;
+DROP TABLE is_used_lock;
+drop table if exists last_day;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LAST_DAY;
-drop table if exists LAST_INSERT_ID;
+DROP TABLE last_day;
+drop table if exists last_insert_id;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LAST_INSERT_ID;
-drop table if exists LCASE;
+DROP TABLE last_insert_id;
+drop table if exists lcase;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LCASE;
-drop table if exists LEAST;
+DROP TABLE lcase;
+drop table if exists least;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LEAST;
-drop table if exists LENGTH;
+DROP TABLE least;
+drop table if exists length;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LENGTH;
-drop table if exists LINEFROMTEXT;
+DROP TABLE length;
+drop table if exists linefromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LINEFROMTEXT;
-drop table if exists LINEFROMWKB;
+DROP TABLE linefromtext;
+drop table if exists linefromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LINEFROMWKB;
-drop table if exists LINESTRINGFROMTEXT;
+DROP TABLE linefromwkb;
+drop table if exists linestringfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LINESTRINGFROMTEXT;
-drop table if exists LINESTRINGFROMWKB;
+DROP TABLE linestringfromtext;
+drop table if exists linestringfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LINESTRINGFROMWKB;
-drop table if exists LN;
+DROP TABLE linestringfromwkb;
+drop table if exists ln;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LN;
-drop table if exists LOAD_FILE;
+DROP TABLE ln;
+drop table if exists load_file;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LOAD_FILE;
-drop table if exists LOCATE;
+DROP TABLE load_file;
+drop table if exists locate;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LOCATE;
-drop table if exists LOG;
+DROP TABLE locate;
+drop table if exists log;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LOG;
-drop table if exists LOG10;
+DROP TABLE log;
+drop table if exists log10;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LOG10;
-drop table if exists LOG2;
+DROP TABLE log10;
+drop table if exists log2;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LOG2;
-drop table if exists LOWER;
+DROP TABLE log2;
+drop table if exists lower;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LOWER;
-drop table if exists LPAD;
+DROP TABLE lower;
+drop table if exists lpad;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LPAD;
-drop table if exists LTRIM;
+DROP TABLE lpad;
+drop table if exists ltrim;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE LTRIM;
-drop table if exists MAKEDATE;
+DROP TABLE ltrim;
+drop table if exists makedate;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MAKEDATE;
-drop table if exists MAKETIME;
+DROP TABLE makedate;
+drop table if exists maketime;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MAKETIME;
-drop table if exists MAKE_SET;
+DROP TABLE maketime;
+drop table if exists make_set;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MAKE_SET;
-drop table if exists MASTER_POS_WAIT;
+DROP TABLE make_set;
+drop table if exists master_pos_wait;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MASTER_POS_WAIT;
-drop table if exists MBRCONTAINS;
+DROP TABLE master_pos_wait;
+drop table if exists mbrcontains;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MBRCONTAINS;
-drop table if exists MBRDISJOINT;
+DROP TABLE mbrcontains;
+drop table if exists mbrdisjoint;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MBRDISJOINT;
-drop table if exists MBREQUAL;
+DROP TABLE mbrdisjoint;
+drop table if exists mbrequal;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MBREQUAL;
-drop table if exists MBRINTERSECTS;
+DROP TABLE mbrequal;
+drop table if exists mbrintersects;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MBRINTERSECTS;
-drop table if exists MBROVERLAPS;
+DROP TABLE mbrintersects;
+drop table if exists mbroverlaps;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MBROVERLAPS;
-drop table if exists MBRTOUCHES;
+DROP TABLE mbroverlaps;
+drop table if exists mbrtouches;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MBRTOUCHES;
-drop table if exists MBRWITHIN;
+DROP TABLE mbrtouches;
+drop table if exists mbrwithin;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MBRWITHIN;
-drop table if exists MD5;
+DROP TABLE mbrwithin;
+drop table if exists md5;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MD5;
-drop table if exists MLINEFROMTEXT;
+DROP TABLE md5;
+drop table if exists mlinefromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MLINEFROMTEXT;
-drop table if exists MLINEFROMWKB;
+DROP TABLE mlinefromtext;
+drop table if exists mlinefromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MLINEFROMWKB;
-drop table if exists MONTHNAME;
+DROP TABLE mlinefromwkb;
+drop table if exists monthname;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MONTHNAME;
-drop table if exists MPOINTFROMTEXT;
+DROP TABLE monthname;
+drop table if exists mpointfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MPOINTFROMTEXT;
-drop table if exists MPOINTFROMWKB;
+DROP TABLE mpointfromtext;
+drop table if exists mpointfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MPOINTFROMWKB;
-drop table if exists MPOLYFROMTEXT;
+DROP TABLE mpointfromwkb;
+drop table if exists mpolyfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MPOLYFROMTEXT;
-drop table if exists MPOLYFROMWKB;
+DROP TABLE mpolyfromtext;
+drop table if exists mpolyfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MPOLYFROMWKB;
-drop table if exists MULTILINESTRINGFROMTEXT;
+DROP TABLE mpolyfromwkb;
+drop table if exists multilinestringfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MULTILINESTRINGFROMTEXT;
-drop table if exists MULTILINESTRINGFROMWKB;
+DROP TABLE multilinestringfromtext;
+drop table if exists multilinestringfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MULTILINESTRINGFROMWKB;
-drop table if exists MULTIPOINTFROMTEXT;
+DROP TABLE multilinestringfromwkb;
+drop table if exists multipointfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MULTIPOINTFROMTEXT;
-drop table if exists MULTIPOINTFROMWKB;
+DROP TABLE multipointfromtext;
+drop table if exists multipointfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MULTIPOINTFROMWKB;
-drop table if exists MULTIPOLYGONFROMTEXT;
+DROP TABLE multipointfromwkb;
+drop table if exists multipolygonfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MULTIPOLYGONFROMTEXT;
-drop table if exists MULTIPOLYGONFROMWKB;
+DROP TABLE multipolygonfromtext;
+drop table if exists multipolygonfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE MULTIPOLYGONFROMWKB;
-drop table if exists NAME_CONST;
+DROP TABLE multipolygonfromwkb;
+drop table if exists name_const;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE NAME_CONST;
-drop table if exists NULLIF;
+DROP TABLE name_const;
+drop table if exists nullif;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE NULLIF;
-drop table if exists NUMGEOMETRIES;
+DROP TABLE nullif;
+drop table if exists numgeometries;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE NUMGEOMETRIES;
-drop table if exists NUMINTERIORRINGS;
+DROP TABLE numgeometries;
+drop table if exists numinteriorrings;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE NUMINTERIORRINGS;
-drop table if exists NUMPOINTS;
+DROP TABLE numinteriorrings;
+drop table if exists numpoints;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE NUMPOINTS;
-drop table if exists OCT;
+DROP TABLE numpoints;
+drop table if exists oct;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE OCT;
-drop table if exists OCTET_LENGTH;
+DROP TABLE oct;
+drop table if exists octet_length;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE OCTET_LENGTH;
-drop table if exists ORD;
+DROP TABLE octet_length;
+drop table if exists ord;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ORD;
-drop table if exists OVERLAPS;
+DROP TABLE ord;
+drop table if exists overlaps;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE OVERLAPS;
-drop table if exists PERIOD_ADD;
+DROP TABLE overlaps;
+drop table if exists period_add;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE PERIOD_ADD;
-drop table if exists PERIOD_DIFF;
+DROP TABLE period_add;
+drop table if exists period_diff;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE PERIOD_DIFF;
-drop table if exists PI;
+DROP TABLE period_diff;
+drop table if exists pi;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE PI;
-drop table if exists POINTFROMTEXT;
+DROP TABLE pi;
+drop table if exists pointfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE POINTFROMTEXT;
-drop table if exists POINTFROMWKB;
+DROP TABLE pointfromtext;
+drop table if exists pointfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE POINTFROMWKB;
-drop table if exists POINTN;
+DROP TABLE pointfromwkb;
+drop table if exists pointn;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE POINTN;
-drop table if exists POLYFROMTEXT;
+DROP TABLE pointn;
+drop table if exists polyfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE POLYFROMTEXT;
-drop table if exists POLYFROMWKB;
+DROP TABLE polyfromtext;
+drop table if exists polyfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE POLYFROMWKB;
-drop table if exists POLYGONFROMTEXT;
+DROP TABLE polyfromwkb;
+drop table if exists polygonfromtext;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE POLYGONFROMTEXT;
-drop table if exists POLYGONFROMWKB;
+DROP TABLE polygonfromtext;
+drop table if exists polygonfromwkb;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE POLYGONFROMWKB;
-drop table if exists POW;
+DROP TABLE polygonfromwkb;
+drop table if exists pow;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE POW;
-drop table if exists POWER;
+DROP TABLE pow;
+drop table if exists power;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE POWER;
-drop table if exists QUOTE;
+DROP TABLE power;
+drop table if exists quote;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE QUOTE;
-drop table if exists RADIANS;
+DROP TABLE quote;
+drop table if exists radians;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE RADIANS;
-drop table if exists RAND;
+DROP TABLE radians;
+drop table if exists rand;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE RAND;
-drop table if exists RELEASE_LOCK;
+DROP TABLE rand;
+drop table if exists release_lock;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE RELEASE_LOCK;
-drop table if exists REVERSE;
+DROP TABLE release_lock;
+drop table if exists reverse;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE REVERSE;
-drop table if exists ROUND;
+DROP TABLE reverse;
+drop table if exists round;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ROUND;
-drop table if exists ROW_COUNT;
+DROP TABLE round;
+drop table if exists row_count;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE ROW_COUNT;
-drop table if exists RPAD;
+DROP TABLE row_count;
+drop table if exists rpad;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE RPAD;
-drop table if exists RTRIM;
+DROP TABLE rpad;
+drop table if exists rtrim;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE RTRIM;
-drop table if exists SEC_TO_TIME;
+DROP TABLE rtrim;
+drop table if exists sec_to_time;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SEC_TO_TIME;
-drop table if exists SESSION_USER;
+DROP TABLE sec_to_time;
+drop table if exists session_user;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SESSION_USER;
-drop table if exists SHA;
+DROP TABLE session_user;
+drop table if exists sha;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SHA;
-drop table if exists SHA1;
+DROP TABLE sha;
+drop table if exists sha1;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SHA1;
-drop table if exists SIGN;
+DROP TABLE sha1;
+drop table if exists sign;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SIGN;
-drop table if exists SIN;
+DROP TABLE sign;
+drop table if exists sin;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SIN;
-drop table if exists SLEEP;
+DROP TABLE sin;
+drop table if exists sleep;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SLEEP;
-drop table if exists SOUNDEX;
+DROP TABLE sleep;
+drop table if exists soundex;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SOUNDEX;
-drop table if exists SPACE;
+DROP TABLE soundex;
+drop table if exists space;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SPACE;
-drop table if exists SQRT;
+DROP TABLE space;
+drop table if exists sqrt;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SQRT;
-drop table if exists SRID;
+DROP TABLE sqrt;
+drop table if exists srid;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SRID;
-drop table if exists STARTPOINT;
+DROP TABLE srid;
+drop table if exists startpoint;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE STARTPOINT;
-drop table if exists STRCMP;
+DROP TABLE startpoint;
+drop table if exists strcmp;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE STRCMP;
-drop table if exists STR_TO_DATE;
+DROP TABLE strcmp;
+drop table if exists str_to_date;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE STR_TO_DATE;
-drop table if exists SUBDATE;
+DROP TABLE str_to_date;
+drop table if exists subdate;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SUBDATE;
-drop table if exists SUBSTRING_INDEX;
+DROP TABLE subdate;
+drop table if exists substring_index;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SUBSTRING_INDEX;
-drop table if exists SUBTIME;
+DROP TABLE substring_index;
+drop table if exists subtime;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SUBTIME;
-drop table if exists SYSTEM_USER;
+DROP TABLE subtime;
+drop table if exists system_user;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE SYSTEM_USER;
-drop table if exists TAN;
+DROP TABLE system_user;
+drop table if exists tan;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE TAN;
-drop table if exists TIMEDIFF;
+DROP TABLE tan;
+drop table if exists timediff;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE TIMEDIFF;
-drop table if exists TIME_FORMAT;
+DROP TABLE timediff;
+drop table if exists time_format;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE TIME_FORMAT;
-drop table if exists TIME_TO_SEC;
+DROP TABLE time_format;
+drop table if exists time_to_sec;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE TIME_TO_SEC;
-drop table if exists TOUCHES;
+DROP TABLE time_to_sec;
+drop table if exists touches;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE TOUCHES;
-drop table if exists TO_DAYS;
+DROP TABLE touches;
+drop table if exists to_days;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE TO_DAYS;
-drop table if exists UCASE;
+DROP TABLE to_days;
+drop table if exists ucase;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE UCASE;
-drop table if exists UNCOMPRESS;
+DROP TABLE ucase;
+drop table if exists uncompress;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE UNCOMPRESS;
-drop table if exists UNCOMPRESSED_LENGTH;
+DROP TABLE uncompress;
+drop table if exists uncompressed_length;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE UNCOMPRESSED_LENGTH;
-drop table if exists UNHEX;
+DROP TABLE uncompressed_length;
+drop table if exists unhex;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE UNHEX;
-drop table if exists UNIX_TIMESTAMP;
+DROP TABLE unhex;
+drop table if exists unix_timestamp;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE UNIX_TIMESTAMP;
-drop table if exists UPDATEXML;
+DROP TABLE unix_timestamp;
+drop table if exists updatexml;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE UPDATEXML;
-drop table if exists UPPER;
+DROP TABLE updatexml;
+drop table if exists upper;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE UPPER;
-drop table if exists UUID;
+DROP TABLE upper;
+drop table if exists uuid;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE UUID;
-drop table if exists VERSION;
+DROP TABLE uuid;
+drop table if exists version;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE VERSION;
-drop table if exists WEEKDAY;
+DROP TABLE version;
+drop table if exists weekday;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE WEEKDAY;
-drop table if exists WEEKOFYEAR;
+DROP TABLE weekday;
+drop table if exists weekofyear;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE WEEKOFYEAR;
-drop table if exists WITHIN;
+DROP TABLE weekofyear;
+drop table if exists within;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE WITHIN;
-drop table if exists X;
+DROP TABLE within;
+drop table if exists x;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE X;
-drop table if exists Y;
+DROP TABLE x;
+drop table if exists y;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE Y;
-drop table if exists YEARWEEK;
+DROP TABLE y;
+drop table if exists yearweek;
 drop table if exists bug21114_child;
 DROP TABLE bug21114_child;
-DROP TABLE YEARWEEK;
+DROP TABLE yearweek;
diff --git a/mysql-test/t/parser_bug21114_innodb.test b/mysql-test/t/parser_bug21114_innodb.test
index d2101e2a28d..969eea2da40 100644
--- a/mysql-test/t/parser_bug21114_innodb.test
+++ b/mysql-test/t/parser_bug21114_innodb.test
@@ -11,11 +11,11 @@ let $engine_type=InnoDb;
 
 let $verbose=1;
 
-let $FCT=ABS;
+let $FCT=abs;
 -- source include/parser_bug21114.inc
-let $FCT=FIELD;
+let $FCT=field;
 -- source include/parser_bug21114.inc
-let $FCT=FORMAT;
+let $FCT=format;
 -- source include/parser_bug21114.inc
 
 # Ignoring the result of SHOW CREATE (this generates too much noise)
@@ -23,400 +23,400 @@ let $FCT=FORMAT;
 
 let verbose=0;
 
-let $FCT=ACOS;
+let $FCT=acos;
 -- source include/parser_bug21114.inc
-let $FCT=ADDDATE;
+let $FCT=adddate;
 -- source include/parser_bug21114.inc
-let $FCT=ADDTIME;
+let $FCT=addtime;
 -- source include/parser_bug21114.inc
-let $FCT=AES_DECRYPT;
+let $FCT=aes_decrypt;
 -- source include/parser_bug21114.inc
-let $FCT=AES_ENCRYPT;
+let $FCT=aes_encrypt;
 -- source include/parser_bug21114.inc
-let $FCT=AREA;
+let $FCT=area;
 -- source include/parser_bug21114.inc
-let $FCT=ASBINARY;
+let $FCT=asbinary;
 -- source include/parser_bug21114.inc
-let $FCT=ASIN;
+let $FCT=asin;
 -- source include/parser_bug21114.inc
-let $FCT=ASTEXT;
+let $FCT=astext;
 -- source include/parser_bug21114.inc
-let $FCT=ASWKB;
+let $FCT=aswkb;
 -- source include/parser_bug21114.inc
-let $FCT=ASWKT;
+let $FCT=aswkt;
 -- source include/parser_bug21114.inc
-let $FCT=ATAN;
+let $FCT=atan;
 -- source include/parser_bug21114.inc
-let $FCT=ATAN2;
+let $FCT=atan2;
 -- source include/parser_bug21114.inc
-let $FCT=BENCHMARK;
+let $FCT=benchmark;
 -- source include/parser_bug21114.inc
-let $FCT=BIN;
+let $FCT=bin;
 -- source include/parser_bug21114.inc
-let $FCT=BIT_COUNT;
+let $FCT=bit_count;
 -- source include/parser_bug21114.inc
-let $FCT=BIT_LENGTH;
+let $FCT=bit_length;
 -- source include/parser_bug21114.inc
-let $FCT=CEIL;
+let $FCT=ceil;
 -- source include/parser_bug21114.inc
-let $FCT=CEILING;
+let $FCT=ceiling;
 -- source include/parser_bug21114.inc
-let $FCT=CENTROID;
+let $FCT=centroid;
 -- source include/parser_bug21114.inc
-let $FCT=CHARACTER_LENGTH;
+let $FCT=character_length;
 -- source include/parser_bug21114.inc
-let $FCT=CHAR_LENGTH;
+let $FCT=char_length;
 -- source include/parser_bug21114.inc
-let $FCT=COERCIBILITY;
+let $FCT=coercibility;
 -- source include/parser_bug21114.inc
-let $FCT=COMPRESS;
+let $FCT=compress;
 -- source include/parser_bug21114.inc
-let $FCT=CONCAT;
+let $FCT=concat;
 -- source include/parser_bug21114.inc
-let $FCT=CONCAT_WS;
+let $FCT=concat_ws;
 -- source include/parser_bug21114.inc
-let $FCT=CONNECTION_ID;
+let $FCT=connection_id;
 -- source include/parser_bug21114.inc
-let $FCT=CONV;
+let $FCT=conv;
 -- source include/parser_bug21114.inc
-let $FCT=CONVERT_TZ;
+let $FCT=convert_tz;
 -- source include/parser_bug21114.inc
-let $FCT=COS;
+let $FCT=cos;
 -- source include/parser_bug21114.inc
-let $FCT=COT;
+let $FCT=cot;
 -- source include/parser_bug21114.inc
-let $FCT=CRC32;
+let $FCT=crc32;
 -- source include/parser_bug21114.inc
-let $FCT=CROSSES;
+let $FCT=crosses;
 -- source include/parser_bug21114.inc
-let $FCT=DATEDIFF;
+let $FCT=datediff;
 -- source include/parser_bug21114.inc
-let $FCT=DATE_FORMAT;
+let $FCT=date_format;
 -- source include/parser_bug21114.inc
-let $FCT=DAYNAME;
+let $FCT=dayname;
 -- source include/parser_bug21114.inc
-let $FCT=DAYOFMONTH;
+let $FCT=dayofmonth;
 -- source include/parser_bug21114.inc
-let $FCT=DAYOFWEEK;
+let $FCT=dayofweek;
 -- source include/parser_bug21114.inc
-let $FCT=DAYOFYEAR;
+let $FCT=dayofyear;
 -- source include/parser_bug21114.inc
-let $FCT=DECODE;
+let $FCT=decode;
 -- source include/parser_bug21114.inc
-let $FCT=DEGREES;
+let $FCT=degrees;
 -- source include/parser_bug21114.inc
-let $FCT=DES_DECRYPT;
+let $FCT=des_decrypt;
 -- source include/parser_bug21114.inc
-let $FCT=DES_ENCRYPT;
+let $FCT=des_encrypt;
 -- source include/parser_bug21114.inc
-let $FCT=DIMENSION;
+let $FCT=dimension;
 -- source include/parser_bug21114.inc
-let $FCT=DISJOINT;
+let $FCT=disjoint;
 -- source include/parser_bug21114.inc
-let $FCT=ELT;
+let $FCT=elt;
 -- source include/parser_bug21114.inc
-let $FCT=ENCODE;
+let $FCT=encode;
 -- source include/parser_bug21114.inc
-let $FCT=ENCRYPT;
+let $FCT=encrypt;
 -- source include/parser_bug21114.inc
-let $FCT=ENDPOINT;
+let $FCT=endpoint;
 -- source include/parser_bug21114.inc
-let $FCT=ENVELOPE;
+let $FCT=envelope;
 -- source include/parser_bug21114.inc
-let $FCT=EQUALS;
+let $FCT=equals;
 -- source include/parser_bug21114.inc
-let $FCT=EXP;
+let $FCT=exp;
 -- source include/parser_bug21114.inc
-let $FCT=EXPORT_SET;
+let $FCT=export_set;
 -- source include/parser_bug21114.inc
-let $FCT=EXTERIORRING;
+let $FCT=exteriorring;
 -- source include/parser_bug21114.inc
-let $FCT=EXTRACTVALUE;
+let $FCT=extractvalue;
 -- source include/parser_bug21114.inc
-let $FCT=FIND_IN_SET;
+let $FCT=find_in_set;
 -- source include/parser_bug21114.inc
-let $FCT=FLOOR;
+let $FCT=floor;
 -- source include/parser_bug21114.inc
-let $FCT=FOUND_ROWS;
+let $FCT=found_rows;
 -- source include/parser_bug21114.inc
-let $FCT=FROM_DAYS;
+let $FCT=from_days;
 -- source include/parser_bug21114.inc
-let $FCT=FROM_UNIXTIME;
+let $FCT=from_unixtime;
 -- source include/parser_bug21114.inc
-let $FCT=GEOMCOLLFROMTEXT;
+let $FCT=geomcollfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=GEOMCOLLFROMWKB;
+let $FCT=geomcollfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=GEOMETRYCOLLECTIONFROMTEXT;
+let $FCT=geometrycollectionfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=GEOMETRYCOLLECTIONFROMWKB;
+let $FCT=geometrycollectionfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=GEOMETRYFROMTEXT;
+let $FCT=geometryfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=GEOMETRYFROMWKB;
+let $FCT=geometryfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=GEOMETRYN;
+let $FCT=geometryn;
 -- source include/parser_bug21114.inc
-let $FCT=GEOMETRYTYPE;
+let $FCT=geometrytype;
 -- source include/parser_bug21114.inc
-let $FCT=GEOMFROMTEXT;
+let $FCT=geomfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=GEOMFROMWKB;
+let $FCT=geomfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=GET_LOCK;
+let $FCT=get_lock;
 -- source include/parser_bug21114.inc
-let $FCT=GLENGTH;
+let $FCT=glength;
 -- source include/parser_bug21114.inc
-let $FCT=GREATEST;
+let $FCT=greatest;
 -- source include/parser_bug21114.inc
-let $FCT=HEX;
+let $FCT=hex;
 -- source include/parser_bug21114.inc
-let $FCT=IFNULL;
+let $FCT=ifnull;
 -- source include/parser_bug21114.inc
-let $FCT=INET_ATON;
+let $FCT=inet_aton;
 -- source include/parser_bug21114.inc
-let $FCT=INET_NTOA;
+let $FCT=inet_ntoa;
 -- source include/parser_bug21114.inc
-let $FCT=INSTR;
+let $FCT=instr;
 -- source include/parser_bug21114.inc
-let $FCT=INTERIORRINGN;
+let $FCT=interiorringn;
 -- source include/parser_bug21114.inc
-let $FCT=INTERSECTS;
+let $FCT=intersects;
 -- source include/parser_bug21114.inc
-let $FCT=ISCLOSED;
+let $FCT=isclosed;
 -- source include/parser_bug21114.inc
-let $FCT=ISEMPTY;
+let $FCT=isempty;
 -- source include/parser_bug21114.inc
-let $FCT=ISNULL;
+let $FCT=isnull;
 -- source include/parser_bug21114.inc
-let $FCT=ISSIMPLE;
+let $FCT=issimple;
 -- source include/parser_bug21114.inc
-let $FCT=IS_FREE_LOCK;
+let $FCT=is_free_lock;
 -- source include/parser_bug21114.inc
-let $FCT=IS_USED_LOCK;
+let $FCT=is_used_lock;
 -- source include/parser_bug21114.inc
-let $FCT=LAST_DAY;
+let $FCT=last_day;
 -- source include/parser_bug21114.inc
-let $FCT=LAST_INSERT_ID;
+let $FCT=last_insert_id;
 -- source include/parser_bug21114.inc
-let $FCT=LCASE;
+let $FCT=lcase;
 -- source include/parser_bug21114.inc
-let $FCT=LEAST;
+let $FCT=least;
 -- source include/parser_bug21114.inc
-let $FCT=LENGTH;
+let $FCT=length;
 -- source include/parser_bug21114.inc
-let $FCT=LINEFROMTEXT;
+let $FCT=linefromtext;
 -- source include/parser_bug21114.inc
-let $FCT=LINEFROMWKB;
+let $FCT=linefromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=LINESTRINGFROMTEXT;
+let $FCT=linestringfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=LINESTRINGFROMWKB;
+let $FCT=linestringfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=LN;
+let $FCT=ln;
 -- source include/parser_bug21114.inc
-let $FCT=LOAD_FILE;
+let $FCT=load_file;
 -- source include/parser_bug21114.inc
-let $FCT=LOCATE;
+let $FCT=locate;
 -- source include/parser_bug21114.inc
-let $FCT=LOG;
+let $FCT=log;
 -- source include/parser_bug21114.inc
-let $FCT=LOG10;
+let $FCT=log10;
 -- source include/parser_bug21114.inc
-let $FCT=LOG2;
+let $FCT=log2;
 -- source include/parser_bug21114.inc
-let $FCT=LOWER;
+let $FCT=lower;
 -- source include/parser_bug21114.inc
-let $FCT=LPAD;
+let $FCT=lpad;
 -- source include/parser_bug21114.inc
-let $FCT=LTRIM;
+let $FCT=ltrim;
 -- source include/parser_bug21114.inc
-let $FCT=MAKEDATE;
+let $FCT=makedate;
 -- source include/parser_bug21114.inc
-let $FCT=MAKETIME;
+let $FCT=maketime;
 -- source include/parser_bug21114.inc
-let $FCT=MAKE_SET;
+let $FCT=make_set;
 -- source include/parser_bug21114.inc
-let $FCT=MASTER_POS_WAIT;
+let $FCT=master_pos_wait;
 -- source include/parser_bug21114.inc
-let $FCT=MBRCONTAINS;
+let $FCT=mbrcontains;
 -- source include/parser_bug21114.inc
-let $FCT=MBRDISJOINT;
+let $FCT=mbrdisjoint;
 -- source include/parser_bug21114.inc
-let $FCT=MBREQUAL;
+let $FCT=mbrequal;
 -- source include/parser_bug21114.inc
-let $FCT=MBRINTERSECTS;
+let $FCT=mbrintersects;
 -- source include/parser_bug21114.inc
-let $FCT=MBROVERLAPS;
+let $FCT=mbroverlaps;
 -- source include/parser_bug21114.inc
-let $FCT=MBRTOUCHES;
+let $FCT=mbrtouches;
 -- source include/parser_bug21114.inc
-let $FCT=MBRWITHIN;
+let $FCT=mbrwithin;
 -- source include/parser_bug21114.inc
-let $FCT=MD5;
+let $FCT=md5;
 -- source include/parser_bug21114.inc
-let $FCT=MLINEFROMTEXT;
+let $FCT=mlinefromtext;
 -- source include/parser_bug21114.inc
-let $FCT=MLINEFROMWKB;
+let $FCT=mlinefromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=MONTHNAME;
+let $FCT=monthname;
 -- source include/parser_bug21114.inc
-let $FCT=MPOINTFROMTEXT;
+let $FCT=mpointfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=MPOINTFROMWKB;
+let $FCT=mpointfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=MPOLYFROMTEXT;
+let $FCT=mpolyfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=MPOLYFROMWKB;
+let $FCT=mpolyfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=MULTILINESTRINGFROMTEXT;
+let $FCT=multilinestringfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=MULTILINESTRINGFROMWKB;
+let $FCT=multilinestringfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=MULTIPOINTFROMTEXT;
+let $FCT=multipointfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=MULTIPOINTFROMWKB;
+let $FCT=multipointfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=MULTIPOLYGONFROMTEXT;
+let $FCT=multipolygonfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=MULTIPOLYGONFROMWKB;
+let $FCT=multipolygonfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=NAME_CONST;
+let $FCT=name_const;
 -- source include/parser_bug21114.inc
-let $FCT=NULLIF;
+let $FCT=nullif;
 -- source include/parser_bug21114.inc
-let $FCT=NUMGEOMETRIES;
+let $FCT=numgeometries;
 -- source include/parser_bug21114.inc
-let $FCT=NUMINTERIORRINGS;
+let $FCT=numinteriorrings;
 -- source include/parser_bug21114.inc
-let $FCT=NUMPOINTS;
+let $FCT=numpoints;
 -- source include/parser_bug21114.inc
-let $FCT=OCT;
+let $FCT=oct;
 -- source include/parser_bug21114.inc
-let $FCT=OCTET_LENGTH;
+let $FCT=octet_length;
 -- source include/parser_bug21114.inc
-let $FCT=ORD;
+let $FCT=ord;
 -- source include/parser_bug21114.inc
-let $FCT=OVERLAPS;
+let $FCT=overlaps;
 -- source include/parser_bug21114.inc
-let $FCT=PERIOD_ADD;
+let $FCT=period_add;
 -- source include/parser_bug21114.inc
-let $FCT=PERIOD_DIFF;
+let $FCT=period_diff;
 -- source include/parser_bug21114.inc
-let $FCT=PI;
+let $FCT=pi;
 -- source include/parser_bug21114.inc
-let $FCT=POINTFROMTEXT;
+let $FCT=pointfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=POINTFROMWKB;
+let $FCT=pointfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=POINTN;
+let $FCT=pointn;
 -- source include/parser_bug21114.inc
-let $FCT=POLYFROMTEXT;
+let $FCT=polyfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=POLYFROMWKB;
+let $FCT=polyfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=POLYGONFROMTEXT;
+let $FCT=polygonfromtext;
 -- source include/parser_bug21114.inc
-let $FCT=POLYGONFROMWKB;
+let $FCT=polygonfromwkb;
 -- source include/parser_bug21114.inc
-let $FCT=POW;
+let $FCT=pow;
 -- source include/parser_bug21114.inc
-let $FCT=POWER;
+let $FCT=power;
 -- source include/parser_bug21114.inc
-let $FCT=QUOTE;
+let $FCT=quote;
 -- source include/parser_bug21114.inc
-let $FCT=RADIANS;
+let $FCT=radians;
 -- source include/parser_bug21114.inc
-let $FCT=RAND;
+let $FCT=rand;
 -- source include/parser_bug21114.inc
-let $FCT=RELEASE_LOCK;
+let $FCT=release_lock;
 -- source include/parser_bug21114.inc
-let $FCT=REVERSE;
+let $FCT=reverse;
 -- source include/parser_bug21114.inc
-let $FCT=ROUND;
+let $FCT=round;
 -- source include/parser_bug21114.inc
-let $FCT=ROW_COUNT;
+let $FCT=row_count;
 -- source include/parser_bug21114.inc
-let $FCT=RPAD;
+let $FCT=rpad;
 -- source include/parser_bug21114.inc
-let $FCT=RTRIM;
+let $FCT=rtrim;
 -- source include/parser_bug21114.inc
-let $FCT=SEC_TO_TIME;
+let $FCT=sec_to_time;
 -- source include/parser_bug21114.inc
-let $FCT=SESSION_USER;
+let $FCT=session_user;
 -- source include/parser_bug21114.inc
-let $FCT=SHA;
+let $FCT=sha;
 -- source include/parser_bug21114.inc
-let $FCT=SHA1;
+let $FCT=sha1;
 -- source include/parser_bug21114.inc
-let $FCT=SIGN;
+let $FCT=sign;
 -- source include/parser_bug21114.inc
-let $FCT=SIN;
+let $FCT=sin;
 -- source include/parser_bug21114.inc
-let $FCT=SLEEP;
+let $FCT=sleep;
 -- source include/parser_bug21114.inc
-let $FCT=SOUNDEX;
+let $FCT=soundex;
 -- source include/parser_bug21114.inc
-let $FCT=SPACE;
+let $FCT=space;
 -- source include/parser_bug21114.inc
-let $FCT=SQRT;
+let $FCT=sqrt;
 -- source include/parser_bug21114.inc
-let $FCT=SRID;
+let $FCT=srid;
 -- source include/parser_bug21114.inc
-let $FCT=STARTPOINT;
+let $FCT=startpoint;
 -- source include/parser_bug21114.inc
-let $FCT=STRCMP;
+let $FCT=strcmp;
 -- source include/parser_bug21114.inc
-let $FCT=STR_TO_DATE;
+let $FCT=str_to_date;
 -- source include/parser_bug21114.inc
-let $FCT=SUBDATE;
+let $FCT=subdate;
 -- source include/parser_bug21114.inc
-let $FCT=SUBSTRING_INDEX;
+let $FCT=substring_index;
 -- source include/parser_bug21114.inc
-let $FCT=SUBTIME;
+let $FCT=subtime;
 -- source include/parser_bug21114.inc
-let $FCT=SYSTEM_USER;
+let $FCT=system_user;
 -- source include/parser_bug21114.inc
-let $FCT=TAN;
+let $FCT=tan;
 -- source include/parser_bug21114.inc
-let $FCT=TIMEDIFF;
+let $FCT=timediff;
 -- source include/parser_bug21114.inc
-let $FCT=TIME_FORMAT;
+let $FCT=time_format;
 -- source include/parser_bug21114.inc
-let $FCT=TIME_TO_SEC;
+let $FCT=time_to_sec;
 -- source include/parser_bug21114.inc
-let $FCT=TOUCHES;
+let $FCT=touches;
 -- source include/parser_bug21114.inc
-let $FCT=TO_DAYS;
+let $FCT=to_days;
 -- source include/parser_bug21114.inc
-let $FCT=UCASE;
+let $FCT=ucase;
 -- source include/parser_bug21114.inc
-let $FCT=UNCOMPRESS;
+let $FCT=uncompress;
 -- source include/parser_bug21114.inc
-let $FCT=UNCOMPRESSED_LENGTH;
+let $FCT=uncompressed_length;
 -- source include/parser_bug21114.inc
-let $FCT=UNHEX;
+let $FCT=unhex;
 -- source include/parser_bug21114.inc
-let $FCT=UNIX_TIMESTAMP;
+let $FCT=unix_timestamp;
 -- source include/parser_bug21114.inc
-let $FCT=UPDATEXML;
+let $FCT=updatexml;
 -- source include/parser_bug21114.inc
-let $FCT=UPPER;
+let $FCT=upper;
 -- source include/parser_bug21114.inc
-let $FCT=UUID;
+let $FCT=uuid;
 -- source include/parser_bug21114.inc
-let $FCT=VERSION;
+let $FCT=version;
 -- source include/parser_bug21114.inc
-let $FCT=WEEKDAY;
+let $FCT=weekday;
 -- source include/parser_bug21114.inc
-let $FCT=WEEKOFYEAR;
+let $FCT=weekofyear;
 -- source include/parser_bug21114.inc
-let $FCT=WITHIN;
+let $FCT=within;
 -- source include/parser_bug21114.inc
-let $FCT=X;
+let $FCT=x;
 -- source include/parser_bug21114.inc
-let $FCT=Y;
+let $FCT=y;
 -- source include/parser_bug21114.inc
-let $FCT=YEARWEEK;
+let $FCT=yearweek;
 -- source include/parser_bug21114.inc