Bug#21114 (Foreign key creation fails to table with name format)

Due to the complexity of this change, everything is documented in WL#3565

This patch is the third iteration, it takes into account the comments
received to date.


mysql-test/r/func_math.result:
  Improved test coverage
mysql-test/r/view.result:
  Name collision, x() is a geometry native in function
mysql-test/t/func_math.test:
  Improved test coverage
mysql-test/t/view.test:
  Name collision, x() is a geometry native in function
sql/item_create.cc:
  Revised the create_func implementation
sql/item_create.h:
  Revised the create_func implementation
sql/item_geofunc.h:
  Explicit Item allocation in the thread memory pool.
sql/lex.h:
  Removed function parsing from the lexical parser
sql/lex_symbol.h:
  Removed function parsing from the lexical parser
sql/mysql_priv.h:
  Server initialization and shutdown
sql/mysqld.cc:
  Server initialization and shutdown
sql/share/errmsg.txt:
  New error messages
sql/sql_yacc.yy:
  Removed function parsing from the lexical parser
tests/mysql_client_test.c:
  Spaces are no longer significant for function calls
mysql-test/include/parser_bug21114.inc:
  New tests
mysql-test/r/parser.result:
  New tests
mysql-test/r/parser_bug21114_innodb.result:
  New tests
mysql-test/t/parser.test:
  New tests
mysql-test/t/parser_bug21114_innodb.test:
  New tests

4 files changed, 1271 insertions, 4 deletions

diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index 4bd18ae589e..9a2c55b802d 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -102,6 +102,18 @@ Note	1003	select pi() AS `pi()`,format(sin((pi() / 2)),6) AS `format(sin(pi()/2)
 select degrees(pi()),radians(360);
 degrees(pi())	radians(360)
 180	6.2831853071796
+select format(atan(-2, 2), 6);
+format(atan(-2, 2), 6)
+-0.785398
+select format(atan(pi(), 0), 6);
+format(atan(pi(), 0), 6)
+1.570796
+select format(atan2(-2, 2), 6);
+format(atan2(-2, 2), 6)
+-0.785398
+select format(atan2(pi(), 0), 6);
+format(atan2(pi(), 0), 6)
+1.570796
 SELECT ACOS(1.0);
 ACOS(1.0)
 0
diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result
new file mode 100644
index 00000000000..afd78561898
--- /dev/null
+++ b/mysql-test/r/parser.result
@@ -0,0 +1,388 @@
+SET @save_sql_mode=@@sql_mode;
+set SQL_MODE='';
+create table ADDDATE(a int);
+drop table ADDDATE;
+create table ADDDATE (a int);
+drop table ADDDATE;
+create table BIT_AND(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_AND(a int)' at line 1
+create table BIT_AND (a int);
+drop table BIT_AND;
+create table BIT_OR(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_OR(a int)' at line 1
+create table BIT_OR (a int);
+drop table BIT_OR;
+create table BIT_XOR(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_XOR(a int)' at line 1
+create table BIT_XOR (a int);
+drop table BIT_XOR;
+create table CAST(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CAST(a int)' at line 1
+create table CAST (a int);
+drop table CAST;
+create table COUNT(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'COUNT(a int)' at line 1
+create table COUNT (a int);
+drop table COUNT;
+create table CURDATE(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURDATE(a int)' at line 1
+create table CURDATE (a int);
+drop table CURDATE;
+create table CURTIME(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURTIME(a int)' at line 1
+create table CURTIME (a int);
+drop table CURTIME;
+create table DATE_ADD(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_ADD(a int)' at line 1
+create table DATE_ADD (a int);
+drop table DATE_ADD;
+create table DATE_SUB(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_SUB(a int)' at line 1
+create table DATE_SUB (a int);
+drop table DATE_SUB;
+create table EXTRACT(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTRACT(a int)' at line 1
+create table EXTRACT (a int);
+drop table EXTRACT;
+create table GROUP_CONCAT(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_CONCAT(a int)' at line 1
+create table GROUP_CONCAT (a int);
+drop table GROUP_CONCAT;
+create table GROUP_UNIQUE_USERS(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_UNIQUE_USERS(a int)' at line 1
+create table GROUP_UNIQUE_USERS (a int);
+drop table GROUP_UNIQUE_USERS;
+create table MAX(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MAX(a int)' at line 1
+create table MAX (a int);
+drop table MAX;
+create table MID(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MID(a int)' at line 1
+create table MID (a int);
+drop table MID;
+create table MIN(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MIN(a int)' at line 1
+create table MIN (a int);
+drop table MIN;
+create table NOW(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NOW(a int)' at line 1
+create table NOW (a int);
+drop table NOW;
+create table POSITION(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'POSITION(a int)' at line 1
+create table POSITION (a int);
+drop table POSITION;
+create table SESSION_USER(a int);
+drop table SESSION_USER;
+create table SESSION_USER (a int);
+drop table SESSION_USER;
+create table STD(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STD(a int)' at line 1
+create table STD (a int);
+drop table STD;
+create table STDDEV(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV(a int)' at line 1
+create table STDDEV (a int);
+drop table STDDEV;
+create table STDDEV_POP(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_POP(a int)' at line 1
+create table STDDEV_POP (a int);
+drop table STDDEV_POP;
+create table STDDEV_SAMP(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_SAMP(a int)' at line 1
+create table STDDEV_SAMP (a int);
+drop table STDDEV_SAMP;
+create table SUBDATE(a int);
+drop table SUBDATE;
+create table SUBDATE (a int);
+drop table SUBDATE;
+create table SUBSTR(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTR(a int)' at line 1
+create table SUBSTR (a int);
+drop table SUBSTR;
+create table SUBSTRING(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTRING(a int)' at line 1
+create table SUBSTRING (a int);
+drop table SUBSTRING;
+create table SUM(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUM(a int)' at line 1
+create table SUM (a int);
+drop table SUM;
+create table SYSDATE(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SYSDATE(a int)' at line 1
+create table SYSDATE (a int);
+drop table SYSDATE;
+create table SYSTEM_USER(a int);
+drop table SYSTEM_USER;
+create table SYSTEM_USER (a int);
+drop table SYSTEM_USER;
+create table TRIM(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRIM(a int)' at line 1
+create table TRIM (a int);
+drop table TRIM;
+create table UNIQUE_USERS(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNIQUE_USERS(a int)' at line 1
+create table UNIQUE_USERS (a int);
+drop table UNIQUE_USERS;
+create table VARIANCE(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VARIANCE(a int)' at line 1
+create table VARIANCE (a int);
+drop table VARIANCE;
+create table VAR_POP(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_POP(a int)' at line 1
+create table VAR_POP (a int);
+drop table VAR_POP;
+create table VAR_SAMP(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_SAMP(a int)' at line 1
+create table VAR_SAMP (a int);
+drop table VAR_SAMP;
+set SQL_MODE='IGNORE_SPACE';
+create table ADDDATE(a int);
+drop table ADDDATE;
+create table ADDDATE (a int);
+drop table ADDDATE;
+create table BIT_AND(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_AND(a int)' at line 1
+create table BIT_AND (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_AND (a int)' at line 1
+create table BIT_OR(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_OR(a int)' at line 1
+create table BIT_OR (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_OR (a int)' at line 1
+create table BIT_XOR(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_XOR(a int)' at line 1
+create table BIT_XOR (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_XOR (a int)' at line 1
+create table CAST(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CAST(a int)' at line 1
+create table CAST (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CAST (a int)' at line 1
+create table COUNT(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'COUNT(a int)' at line 1
+create table COUNT (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'COUNT (a int)' at line 1
+create table CURDATE(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURDATE(a int)' at line 1
+create table CURDATE (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURDATE (a int)' at line 1
+create table CURTIME(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURTIME(a int)' at line 1
+create table CURTIME (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURTIME (a int)' at line 1
+create table DATE_ADD(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_ADD(a int)' at line 1
+create table DATE_ADD (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_ADD (a int)' at line 1
+create table DATE_SUB(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_SUB(a int)' at line 1
+create table DATE_SUB (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_SUB (a int)' at line 1
+create table EXTRACT(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTRACT(a int)' at line 1
+create table EXTRACT (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTRACT (a int)' at line 1
+create table GROUP_CONCAT(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_CONCAT(a int)' at line 1
+create table GROUP_CONCAT (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_CONCAT (a int)' at line 1
+create table GROUP_UNIQUE_USERS(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_UNIQUE_USERS(a int)' at line 1
+create table GROUP_UNIQUE_USERS (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_UNIQUE_USERS (a int)' at line 1
+create table MAX(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MAX(a int)' at line 1
+create table MAX (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MAX (a int)' at line 1
+create table MID(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MID(a int)' at line 1
+create table MID (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MID (a int)' at line 1
+create table MIN(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MIN(a int)' at line 1
+create table MIN (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MIN (a int)' at line 1
+create table NOW(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NOW(a int)' at line 1
+create table NOW (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NOW (a int)' at line 1
+create table POSITION(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'POSITION(a int)' at line 1
+create table POSITION (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'POSITION (a int)' at line 1
+create table SESSION_USER(a int);
+drop table SESSION_USER;
+create table SESSION_USER (a int);
+drop table SESSION_USER;
+create table STD(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STD(a int)' at line 1
+create table STD (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STD (a int)' at line 1
+create table STDDEV(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV(a int)' at line 1
+create table STDDEV (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV (a int)' at line 1
+create table STDDEV_POP(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_POP(a int)' at line 1
+create table STDDEV_POP (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_POP (a int)' at line 1
+create table STDDEV_SAMP(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_SAMP(a int)' at line 1
+create table STDDEV_SAMP (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_SAMP (a int)' at line 1
+create table SUBDATE(a int);
+drop table SUBDATE;
+create table SUBDATE (a int);
+drop table SUBDATE;
+create table SUBSTR(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTR(a int)' at line 1
+create table SUBSTR (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTR (a int)' at line 1
+create table SUBSTRING(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTRING(a int)' at line 1
+create table SUBSTRING (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTRING (a int)' at line 1
+create table SUM(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUM(a int)' at line 1
+create table SUM (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUM (a int)' at line 1
+create table SYSDATE(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SYSDATE(a int)' at line 1
+create table SYSDATE (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SYSDATE (a int)' at line 1
+create table SYSTEM_USER(a int);
+drop table SYSTEM_USER;
+create table SYSTEM_USER (a int);
+drop table SYSTEM_USER;
+create table TRIM(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRIM(a int)' at line 1
+create table TRIM (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRIM (a int)' at line 1
+create table UNIQUE_USERS(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNIQUE_USERS(a int)' at line 1
+create table UNIQUE_USERS (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNIQUE_USERS (a int)' at line 1
+create table VARIANCE(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VARIANCE(a int)' at line 1
+create table VARIANCE (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VARIANCE (a int)' at line 1
+create table VAR_POP(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_POP(a int)' at line 1
+create table VAR_POP (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_POP (a int)' at line 1
+create table VAR_SAMP(a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_SAMP(a int)' at line 1
+create table VAR_SAMP (a int);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_SAMP (a int)' at line 1
+SET @@sql_mode=@save_sql_mode;
+select pi(3.14);
+ERROR 42000: Incorrect parameter count in the call to native function 'pi'
+select tan();
+ERROR 42000: Incorrect parameter count in the call to native function 'tan'
+select tan(1, 2);
+ERROR 42000: Incorrect parameter count in the call to native function 'tan'
+select makedate(1);
+ERROR 42000: Incorrect parameter count in the call to native function 'makedate'
+select makedate(1, 2, 3);
+ERROR 42000: Incorrect parameter count in the call to native function 'makedate'
+select maketime();
+ERROR 42000: Incorrect parameter count in the call to native function 'maketime'
+select maketime(1);
+ERROR 42000: Incorrect parameter count in the call to native function 'maketime'
+select maketime(1, 2);
+ERROR 42000: Incorrect parameter count in the call to native function 'maketime'
+select maketime(1, 2, 3, 4);
+ERROR 42000: Incorrect parameter count in the call to native function 'maketime'
+select atan();
+ERROR 42000: Incorrect parameter count in the call to native function 'atan'
+select atan2(1, 2, 3);
+ERROR 42000: Incorrect parameter count in the call to native function 'atan2'
+select benchmark(10, 1+1);
+benchmark(10, 1+1)
+0
+select benchmark(5+5, 2);
+ERROR 42000: Incorrect parameters in the call to native function 'BENCHMARK'
+select concat();
+ERROR 42000: Incorrect parameter count in the call to native function 'concat'
+select concat("foo");
+concat("foo")
+foo
+select concat_ws();
+ERROR 42000: Incorrect parameter count in the call to native function 'concat_ws'
+select concat_ws("foo");
+ERROR 42000: Incorrect parameter count in the call to native function 'concat_ws'
+set @pwd="my password";
+select encode("secret", @pwd);
+ERROR 42000: Incorrect parameters in the call to native function 'ENCODE'
+select decode("encoded-secret", @pwd);
+ERROR 42000: Incorrect parameters in the call to native function 'DECODE'
+select encrypt();
+ERROR 42000: Incorrect parameter count in the call to native function 'encrypt'
+select encrypt(1, 2, 3);
+ERROR 42000: Incorrect parameter count in the call to native function 'encrypt'
+select des_encrypt("p1", "p2", "not expected");
+ERROR 42000: Incorrect parameter count in the call to native function 'des_encrypt'
+select des_decrypt("p1", "p2", "not expected");
+ERROR 42000: Incorrect parameter count in the call to native function 'des_decrypt'
+select elt();
+ERROR 42000: Incorrect parameter count in the call to native function 'elt'
+select elt(1);
+ERROR 42000: Incorrect parameter count in the call to native function 'elt'
+select export_set();
+ERROR 42000: Incorrect parameter count in the call to native function 'export_set'
+select export_set("p1");
+ERROR 42000: Incorrect parameter count in the call to native function 'export_set'
+select export_set("p1", "p2");
+ERROR 42000: Incorrect parameter count in the call to native function 'export_set'
+select export_set("p1", "p2", "p3", "p4", "p5", "p6");
+ERROR 42000: Incorrect parameter count in the call to native function 'export_set'
+select field();
+ERROR 42000: Incorrect parameter count in the call to native function 'field'
+select field("p1");
+ERROR 42000: Incorrect parameter count in the call to native function 'field'
+set @dec=2;
+select format(pi(), @dec);
+ERROR 42000: Incorrect parameters in the call to native function 'FORMAT'
+select from_unixtime();
+ERROR 42000: Incorrect parameter count in the call to native function 'from_unixtime'
+select from_unixtime(1, 2, 3);
+ERROR 42000: Incorrect parameter count in the call to native function 'from_unixtime'
+select unix_timestamp(1, 2);
+ERROR 42000: Incorrect parameter count in the call to native function 'unix_timestamp'
+select greatest();
+ERROR 42000: Incorrect parameter count in the call to native function 'greatest'
+select greatest(12);
+ERROR 42000: Incorrect parameter count in the call to native function 'greatest'
+select last_insert_id(1, 2);
+ERROR 42000: Incorrect parameter count in the call to native function 'last_insert_id'
+select least();
+ERROR 42000: Incorrect parameter count in the call to native function 'least'
+select least(12);
+ERROR 42000: Incorrect parameter count in the call to native function 'least'
+select locate();
+ERROR 42000: Incorrect parameter count in the call to native function 'locate'
+select locate(1);
+ERROR 42000: Incorrect parameter count in the call to native function 'locate'
+select locate(1, 2, 3, 4);
+ERROR 42000: Incorrect parameter count in the call to native function 'locate'
+select log();
+ERROR 42000: Incorrect parameter count in the call to native function 'log'
+select log(1, 2, 3);
+ERROR 42000: Incorrect parameter count in the call to native function 'log'
+select make_set();
+ERROR 42000: Incorrect parameter count in the call to native function 'make_set'
+select make_set(1);
+ERROR 42000: Incorrect parameter count in the call to native function 'make_set'
+select master_pos_wait();
+ERROR 42000: Incorrect parameter count in the call to native function 'master_pos_wait'
+select master_pos_wait(1);
+ERROR 42000: Incorrect parameter count in the call to native function 'master_pos_wait'
+select master_pos_wait(1, 2, 3, 4);
+ERROR 42000: Incorrect parameter count in the call to native function 'master_pos_wait'
+select rand(1, 2, 3);
+ERROR 42000: Incorrect parameter count in the call to native function 'rand'
+select round(1, 2, 3);
+ERROR 42000: Incorrect parameter count in the call to native function 'round'
+select yearweek();
+ERROR 42000: Incorrect parameter count in the call to native function 'yearweek'
+select yearweek(1, 2, 3);
+ERROR 42000: Incorrect parameter count in the call to native function 'yearweek'
diff --git a/mysql-test/r/parser_bug21114_innodb.result b/mysql-test/r/parser_bug21114_innodb.result
new file mode 100644
index 00000000000..d3ceda38979
--- /dev/null
+++ b/mysql-test/r/parser_bug21114_innodb.result
@@ -0,0 +1,867 @@
+drop table if exists ABS;
+drop table if exists bug21114_child;
+SHOW CREATE TABLE ABS;
+Table	Create Table
+ABS	CREATE TABLE `ABS` (
+  `col1` int(11) NOT NULL,
+  `col2` int(11) NOT NULL,
+  `col3` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`col1`,`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE bug21114_child;
+Table	Create Table
+bug21114_child	CREATE TABLE `bug21114_child` (
+  `pk` int(11) NOT NULL,
+  `fk_col1` int(11) NOT NULL,
+  `fk_col2` int(11) NOT NULL,
+  `fk_col3` int(11) NOT NULL,
+  `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`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE bug21114_child;
+DROP TABLE ABS;
+drop table if exists FIELD;
+drop table if exists bug21114_child;
+SHOW CREATE TABLE FIELD;
+Table	Create Table
+FIELD	CREATE TABLE `FIELD` (
+  `col1` int(11) NOT NULL,
+  `col2` int(11) NOT NULL,
+  `col3` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`col1`,`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE bug21114_child;
+Table	Create Table
+bug21114_child	CREATE TABLE `bug21114_child` (
+  `pk` int(11) NOT NULL,
+  `fk_col1` int(11) NOT NULL,
+  `fk_col2` int(11) NOT NULL,
+  `fk_col3` int(11) NOT NULL,
+  `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`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE bug21114_child;
+DROP TABLE FIELD;
+drop table if exists FORMAT;
+drop table if exists bug21114_child;
+SHOW CREATE TABLE FORMAT;
+Table	Create Table
+FORMAT	CREATE TABLE `FORMAT` (
+  `col1` int(11) NOT NULL,
+  `col2` int(11) NOT NULL,
+  `col3` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`col1`,`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE bug21114_child;
+Table	Create Table
+bug21114_child	CREATE TABLE `bug21114_child` (
+  `pk` int(11) NOT NULL,
+  `fk_col1` int(11) NOT NULL,
+  `fk_col2` int(11) NOT NULL,
+  `fk_col3` int(11) NOT NULL,
+  `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`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+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 if exists bug21114_child;
+DROP TABLE bug21114_child;
+DROP TABLE YEARWEEK;
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 7c467749ee6..1cdb782b2fe 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -791,13 +791,13 @@ test.`f``1` ()
 5
 drop view v1;
 drop function `f``1`;
-create function x () returns int return 5;
-create view v1 as select x ();
+create function a() returns int return 5;
+create view v1 as select a();
 select * from v1;
-x ()
+a()
 5
 drop view v1;
-drop function x;
+drop function a;
 create table t2 (col1 char collate latin1_german2_ci);
 create view v2 as select col1 collate latin1_german1_ci from t2;
 show create view v2;