Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804

Conflicts:
	VERSION
	debian/mariadb-backup-10.2.files
	debian/mariadb-backup-10.2.install
	debian/mariadb-backup-10.3.files
	mysql-test/unstable-tests

83 files changed, 7197 insertions, 6423 deletions

diff --git a/.travis.yml b/.travis.yml
index 56db0736607..639a720fa3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,6 +69,7 @@ matrix:
             - psmisc
             - zlib1g-dev
             - libcrack2-dev
+            - cracklib-runtime
             - libjemalloc-dev
             - libsnappy-dev
             - liblzma-dev
@@ -170,6 +171,7 @@ addons:
       - psmisc
       - zlib1g-dev
       - libcrack2-dev
+      - cracklib-runtime
       - libjemalloc-dev
       - libsnappy-dev
       - liblzma-dev
diff --git a/client/mysql.cc b/client/mysql.cc
index 8252d9af9e5..1e92dce4688 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -4804,10 +4804,11 @@ com_status(String *buffer __attribute__((unused)),
     tee_fprintf(stdout, "Protocol:\t\tCompressed\n");
 #endif
 
-  if ((status_str= mysql_stat(&mysql)) && !mysql_error(&mysql)[0])
+  const char *pos;
+  if ((status_str= mysql_stat(&mysql)) && !mysql_error(&mysql)[0] &&
+      (pos= strchr(status_str,' ')))
   {
     ulong sec;
-    const char *pos= strchr(status_str,' ');
     /* print label */
     tee_fprintf(stdout, "%.*s\t\t\t", (int) (pos-status_str), status_str);
     if ((status_str= str2int(pos,10,0,LONG_MAX,(long*) &sec)))
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 4e4970bacab..c10dc20e7d7 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -1171,6 +1171,8 @@ int main(int argc, char **argv)
   {
     int fd= create_temp_file(cnf_file_path, opt_tmpdir[0] ? opt_tmpdir : NULL,
                              "mysql_upgrade-", O_CREAT | O_WRONLY, MYF(MY_FAE));
+    if (fd < 0)
+      die(NULL);
     my_write(fd, USTRING_WITH_LEN( "[client]\n"), MYF(MY_FAE));
     my_write(fd, (uchar*)ds_args.str, ds_args.length, MYF(MY_FAE));
     my_close(fd, MYF(0));
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 2028606cd5a..c8ebd2217a3 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -92,8 +92,7 @@
 
 static void add_load_option(DYNAMIC_STRING *str, const char *option,
                              const char *option_value);
-static ulong find_set(TYPELIB *lib, const char *x, size_t length,
-                      char **err_pos, uint *err_len);
+static ulong find_set(TYPELIB *, const char *, size_t, char **, uint *);
 static char *alloc_query_str(ulong size);
 
 static void field_escape(DYNAMIC_STRING* in, const char *from);
@@ -5485,7 +5484,7 @@ static ulong find_set(TYPELIB *lib, const char *x, size_t length,
       var_len= (uint) (pos - start);
       strmake(buff, start, MY_MIN(sizeof(buff) - 1, var_len));
       find= find_type(buff, lib, FIND_TYPE_BASIC);
-      if (!find)
+      if (find <= 0)
       {
         *err_pos= (char*) start;
         *err_len= var_len;
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 092ae555318..38b2eb5f672 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -677,7 +677,7 @@ int main(int argc, char **argv)
                                                  MYF(0))))
       return -2;
 
-    for (counter= 0; *argv != NULL; argv++) /* Loop through tables */
+    for (; *argv != NULL; argv++) /* Loop through tables */
     {
       pthread_mutex_lock(&counter_mutex);
       while (counter == opt_use_threads)
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 915727adedb..b036ff5645c 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -602,7 +602,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query,
 void str_to_file(const char *fname, char *str, int size);
 void str_to_file2(const char *fname, char *str, int size, my_bool append);
 
-void fix_win_paths(char *val, int len);
+void fix_win_paths(char *val, size_t len);
 const char *get_errname_from_code (uint error_code);
 int multi_reg_replace(struct st_replace_regex* r,char* val);
 
@@ -2652,6 +2652,7 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
   if (!mysql)
   {
     struct st_command command;
+    DBUG_ASSERT(query_end);
     memset(&command, 0, sizeof(command));
     command.query= (char*)query;
     command.first_word_len= (*query_end - query);
@@ -7468,7 +7469,7 @@ void free_win_path_patterns()
   => all \ from c:\mysql\m... until next space is converted into /
 */
 
-void fix_win_paths(char *val, int len)
+void fix_win_paths(char *val, size_t len)
 {
 #ifdef _WIN32
   uint i;
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c
index 09a477d04ee..d1176a4168c 100644
--- a/libmysqld/libmysql.c
+++ b/libmysqld/libmysql.c
@@ -122,7 +122,9 @@ typedef struct st_mysql_stmt_extension
     1  could not initialize environment (out of memory or thread keys)
 */
 
-int STDCALL mysql_server_init(int argc, char **argv, char **groups)
+int STDCALL mysql_server_init(int argc __attribute__((unused)),
+                              char **argv __attribute__((unused)),
+                              char **groups __attribute__((unused)))
 {
   int result= 0;
   if (!mysql_client_init)
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 0f720c804ab..df9b0d835c2 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2269,10 +2269,15 @@ sub environment_setup {
   $ENV{'MYSQL_EMBEDDED'}=           $exe_mysql_embedded;
 
   my $client_config_exe=
-    native_path("$bindir/libmariadb/mariadb_config$opt_vs_config/mariadb_config");
-  my $tls_info= `$client_config_exe --tlsinfo`;
-  ($ENV{CLIENT_TLS_LIBRARY},$ENV{CLIENT_TLS_LIBRARY_VERSION})=
-    split(/ /, $tls_info, 2);
+    mtr_exe_maybe_exists(
+        "$bindir/libmariadb/mariadb_config$opt_vs_config/mariadb_config",
+               "$bindir/bin/mariadb_config");
+  if ($client_config_exe)
+  {
+    my $tls_info= `$client_config_exe --tlsinfo`;
+    ($ENV{CLIENT_TLS_LIBRARY},$ENV{CLIENT_TLS_LIBRARY_VERSION})=
+      split(/ /, $tls_info, 2);
+  }
   my $exe_mysqld= find_mysqld($basedir);
   $ENV{'MYSQLD'}= $exe_mysqld;
   my $extra_opts= join (" ", @opt_extra_mysqld_opt);
diff --git a/mysql-test/r/analyze_format_json.result b/mysql-test/r/analyze_format_json.result
index e077f919aa0..7991379bc55 100644
--- a/mysql-test/r/analyze_format_json.result
+++ b/mysql-test/r/analyze_format_json.result
@@ -758,3 +758,63 @@ ANALYZE
   }
 }
 drop table t1,t2,t3;
+#
+# MDEV-13286: Floating point exception in Filesort_tracker::print_json_members(Json_writer*)
+#
+create table t0(a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t1 (a int, b int, c int);
+insert into t1 select a,a,a from t0;
+create table t2 as select * from t1;
+analyze format=json select a, (select t2.b from t2 where t2.a<t1.a order by t2.c limit 1) from t1 where t1.a<0;
+ANALYZE
+{
+  "query_block": {
+    "select_id": 1,
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "table": {
+      "table_name": "t1",
+      "access_type": "ALL",
+      "r_loops": 1,
+      "rows": 10,
+      "r_rows": 10,
+      "r_total_time_ms": "REPLACED",
+      "filtered": 100,
+      "r_filtered": 0,
+      "attached_condition": "t1.a < 0"
+    },
+    "subqueries": [
+      {
+        "expression_cache": {
+          "state": "uninitialized",
+          "r_loops": 0,
+          "query_block": {
+            "select_id": 2,
+            "read_sorted_file": {
+              "r_rows": null,
+              "filesort": {
+                "sort_key": "t2.c",
+                "r_loops": null,
+                "r_limit": null,
+                "r_used_priority_queue": null,
+                "r_output_rows": null,
+                "table": {
+                  "table_name": "t2",
+                  "access_type": "ALL",
+                  "r_loops": 0,
+                  "rows": 10,
+                  "r_rows": null,
+                  "filtered": 100,
+                  "r_filtered": null,
+                  "attached_condition": "t2.a < t1.a"
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+drop table t0,t1,t2;
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 98a279c28e9..9f07b1fefff 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -4707,7 +4707,7 @@ pk
 SET SESSION sql_mode=@old_sql_mode;
 drop table t2, t1;
 drop view v1;
-End of 5.0 tests.
+# End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));
 create table t_in  (a2 char(2), b2 char(2), c2 char(2));
@@ -5582,7 +5582,7 @@ insert into t2 values ('x'), ('y');
 select * from t2 where a=(select a from t1) and a='x';
 ERROR 21000: Subquery returns more than 1 row
 drop table t1,t2;
-End of 5.1 tests
+# End of 5.1 tests
 #
 # Bug #11765713 58705:
 # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES
@@ -6194,7 +6194,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2
 OR c_sq1_alias1.pk != @var3)) ) AS alias3;
 pk	col_int_nokey	col_int_key	col_time_key	col_varchar_key	col_varchar_nokey
 DROP TABLE t1,t2;
-End of 5.2 tests
+# End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
 #
@@ -7151,9 +7151,10 @@ INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (f2 INT, KEY(f2));
 INSERT INTO t2 VALUES (3);
 CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-3
+ERROR 42000: Can't group on 'sq'
 SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0;
 f2
 3
@@ -7161,9 +7162,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 );
 count(*)
 1
 delete from t1;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-NULL
+ERROR 42000: Can't group on 'sq'
 drop view v2;
 drop table t1,t2;
 #
@@ -7178,6 +7180,29 @@ f1	f2
 foo	bar
 DROP TABLE t1;
 #
+# MDEV-10146: Wrong result (or questionable result and behavior)
+# with aggregate function in uncorrelated SELECT subquery
+#
+CREATE TABLE t1 (f1 INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (f2 int);
+INSERT INTO t2 VALUES (3);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+( SELECT MAX(f1) FROM t2 )
+2
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+( SELECT MAX(f1) FROM t2 )
+2
+INSERT INTO t2 VALUES (4);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+ERROR 21000: Subquery returns more than 1 row
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+ERROR 21000: Subquery returns more than 1 row
+drop view v1;
+drop table t1,t2;
+# End of 10.0 tests
+#
 # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops
 # with UNION in ALL subquery
 #
@@ -7204,7 +7229,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
 f1	f2	f3
 DROP TABLE t1, t2;
 SET NAMES default;
-End of 10.1 tests
+# End of 10.1 tests
 #
 # MDEV-12564: IN TO EXISTS transformation for rows after 
 #             conversion an outer join to inner join
@@ -7218,4 +7243,4 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo
 pk	i	c	pk	i	c
 1	10	foo	1	10	foo
 DROP TABLE t;
-End of 10.2 tests
+# End of 10.2 tests
diff --git a/mysql-test/r/subselect_no_exists_to_in.result b/mysql-test/r/subselect_no_exists_to_in.result
index 5cee4076ed8..e4b57d96b38 100644
--- a/mysql-test/r/subselect_no_exists_to_in.result
+++ b/mysql-test/r/subselect_no_exists_to_in.result
@@ -4709,7 +4709,7 @@ pk
 SET SESSION sql_mode=@old_sql_mode;
 drop table t2, t1;
 drop view v1;
-End of 5.0 tests.
+# End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));
 create table t_in  (a2 char(2), b2 char(2), c2 char(2));
@@ -5584,7 +5584,7 @@ insert into t2 values ('x'), ('y');
 select * from t2 where a=(select a from t1) and a='x';
 ERROR 21000: Subquery returns more than 1 row
 drop table t1,t2;
-End of 5.1 tests
+# End of 5.1 tests
 #
 # Bug #11765713 58705:
 # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES
@@ -6194,7 +6194,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2
 OR c_sq1_alias1.pk != @var3)) ) AS alias3;
 pk	col_int_nokey	col_int_key	col_time_key	col_varchar_key	col_varchar_nokey
 DROP TABLE t1,t2;
-End of 5.2 tests
+# End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
 #
@@ -7151,9 +7151,10 @@ INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (f2 INT, KEY(f2));
 INSERT INTO t2 VALUES (3);
 CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-3
+ERROR 42000: Can't group on 'sq'
 SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0;
 f2
 3
@@ -7161,9 +7162,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 );
 count(*)
 1
 delete from t1;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-NULL
+ERROR 42000: Can't group on 'sq'
 drop view v2;
 drop table t1,t2;
 #
@@ -7178,6 +7180,29 @@ f1	f2
 foo	bar
 DROP TABLE t1;
 #
+# MDEV-10146: Wrong result (or questionable result and behavior)
+# with aggregate function in uncorrelated SELECT subquery
+#
+CREATE TABLE t1 (f1 INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (f2 int);
+INSERT INTO t2 VALUES (3);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+( SELECT MAX(f1) FROM t2 )
+2
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+( SELECT MAX(f1) FROM t2 )
+2
+INSERT INTO t2 VALUES (4);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+ERROR 21000: Subquery returns more than 1 row
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+ERROR 21000: Subquery returns more than 1 row
+drop view v1;
+drop table t1,t2;
+# End of 10.0 tests
+#
 # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops
 # with UNION in ALL subquery
 #
@@ -7204,7 +7229,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
 f1	f2	f3
 DROP TABLE t1, t2;
 SET NAMES default;
-End of 10.1 tests
+# End of 10.1 tests
 #
 # MDEV-12564: IN TO EXISTS transformation for rows after 
 #             conversion an outer join to inner join
@@ -7218,7 +7243,7 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo
 pk	i	c	pk	i	c
 1	10	foo	1	10	foo
 DROP TABLE t;
-End of 10.2 tests
+# End of 10.2 tests
 set optimizer_switch=default;
 select @@optimizer_switch like '%exists_to_in=off%';
 @@optimizer_switch like '%exists_to_in=off%'
diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result
index e7409b0b09c..22082774668 100644
--- a/mysql-test/r/subselect_no_mat.result
+++ b/mysql-test/r/subselect_no_mat.result
@@ -4707,7 +4707,7 @@ pk
 SET SESSION sql_mode=@old_sql_mode;
 drop table t2, t1;
 drop view v1;
-End of 5.0 tests.
+# End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));
 create table t_in  (a2 char(2), b2 char(2), c2 char(2));
@@ -5582,7 +5582,7 @@ insert into t2 values ('x'), ('y');
 select * from t2 where a=(select a from t1) and a='x';
 ERROR 21000: Subquery returns more than 1 row
 drop table t1,t2;
-End of 5.1 tests
+# End of 5.1 tests
 #
 # Bug #11765713 58705:
 # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES
@@ -6189,7 +6189,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2
 OR c_sq1_alias1.pk != @var3)) ) AS alias3;
 pk	col_int_nokey	col_int_key	col_time_key	col_varchar_key	col_varchar_nokey
 DROP TABLE t1,t2;
-End of 5.2 tests
+# End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
 #
@@ -7144,9 +7144,10 @@ INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (f2 INT, KEY(f2));
 INSERT INTO t2 VALUES (3);
 CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-3
+ERROR 42000: Can't group on 'sq'
 SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0;
 f2
 3
@@ -7154,9 +7155,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 );
 count(*)
 1
 delete from t1;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-NULL
+ERROR 42000: Can't group on 'sq'
 drop view v2;
 drop table t1,t2;
 #
@@ -7171,6 +7173,29 @@ f1	f2
 foo	bar
 DROP TABLE t1;
 #
+# MDEV-10146: Wrong result (or questionable result and behavior)
+# with aggregate function in uncorrelated SELECT subquery
+#
+CREATE TABLE t1 (f1 INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (f2 int);
+INSERT INTO t2 VALUES (3);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+( SELECT MAX(f1) FROM t2 )
+2
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+( SELECT MAX(f1) FROM t2 )
+2
+INSERT INTO t2 VALUES (4);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+ERROR 21000: Subquery returns more than 1 row
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+ERROR 21000: Subquery returns more than 1 row
+drop view v1;
+drop table t1,t2;
+# End of 10.0 tests
+#
 # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops
 # with UNION in ALL subquery
 #
@@ -7197,7 +7222,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
 f1	f2	f3
 DROP TABLE t1, t2;
 SET NAMES default;
-End of 10.1 tests
+# End of 10.1 tests
 #
 # MDEV-12564: IN TO EXISTS transformation for rows after 
 #             conversion an outer join to inner join
@@ -7211,7 +7236,7 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo
 pk	i	c	pk	i	c
 1	10	foo	1	10	foo
 DROP TABLE t;
-End of 10.2 tests
+# End of 10.2 tests
 set optimizer_switch=default;
 select @@optimizer_switch like '%materialization=on%';
 @@optimizer_switch like '%materialization=on%'
diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
index 3bdc91686d7..5f71700c4ce 100644
--- a/mysql-test/r/subselect_no_opts.result
+++ b/mysql-test/r/subselect_no_opts.result
@@ -4703,7 +4703,7 @@ pk
 SET SESSION sql_mode=@old_sql_mode;
 drop table t2, t1;
 drop view v1;
-End of 5.0 tests.
+# End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));
 create table t_in  (a2 char(2), b2 char(2), c2 char(2));
@@ -5578,7 +5578,7 @@ insert into t2 values ('x'), ('y');
 select * from t2 where a=(select a from t1) and a='x';
 ERROR 21000: Subquery returns more than 1 row
 drop table t1,t2;
-End of 5.1 tests
+# End of 5.1 tests
 #
 # Bug #11765713 58705:
 # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES
@@ -6185,7 +6185,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2
 OR c_sq1_alias1.pk != @var3)) ) AS alias3;
 pk	col_int_nokey	col_int_key	col_time_key	col_varchar_key	col_varchar_nokey
 DROP TABLE t1,t2;
-End of 5.2 tests
+# End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
 #
@@ -7142,9 +7142,10 @@ INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (f2 INT, KEY(f2));
 INSERT INTO t2 VALUES (3);
 CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-3
+ERROR 42000: Can't group on 'sq'
 SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0;
 f2
 3
@@ -7152,9 +7153,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 );
 count(*)
 1
 delete from t1;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-NULL
+ERROR 42000: Can't group on 'sq'
 drop view v2;
 drop table t1,t2;
 #
@@ -7169,6 +7171,29 @@ f1	f2
 foo	bar
 DROP TABLE t1;
 #
+# MDEV-10146: Wrong result (or questionable result and behavior)
+# with aggregate function in uncorrelated SELECT subquery
+#
+CREATE TABLE t1 (f1 INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (f2 int);
+INSERT INTO t2 VALUES (3);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+( SELECT MAX(f1) FROM t2 )
+2
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+( SELECT MAX(f1) FROM t2 )
+2
+INSERT INTO t2 VALUES (4);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+ERROR 21000: Subquery returns more than 1 row
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+ERROR 21000: Subquery returns more than 1 row
+drop view v1;
+drop table t1,t2;
+# End of 10.0 tests
+#
 # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops
 # with UNION in ALL subquery
 #
@@ -7195,7 +7220,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
 f1	f2	f3
 DROP TABLE t1, t2;
 SET NAMES default;
-End of 10.1 tests
+# End of 10.1 tests
 #
 # MDEV-12564: IN TO EXISTS transformation for rows after 
 #             conversion an outer join to inner join
@@ -7209,5 +7234,5 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo
 pk	i	c	pk	i	c
 1	10	foo	1	10	foo
 DROP TABLE t;
-End of 10.2 tests
+# End of 10.2 tests
 set @optimizer_switch_for_subselect_test=null;
diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result
index 3beba7c338d..8500fa2434c 100644
--- a/mysql-test/r/subselect_no_scache.result
+++ b/mysql-test/r/subselect_no_scache.result
@@ -4713,7 +4713,7 @@ pk
 SET SESSION sql_mode=@old_sql_mode;
 drop table t2, t1;
 drop view v1;
-End of 5.0 tests.
+# End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));
 create table t_in  (a2 char(2), b2 char(2), c2 char(2));
@@ -5588,7 +5588,7 @@ insert into t2 values ('x'), ('y');
 select * from t2 where a=(select a from t1) and a='x';
 ERROR 21000: Subquery returns more than 1 row
 drop table t1,t2;
-End of 5.1 tests
+# End of 5.1 tests
 #
 # Bug #11765713 58705:
 # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES
@@ -6200,7 +6200,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2
 OR c_sq1_alias1.pk != @var3)) ) AS alias3;
 pk	col_int_nokey	col_int_key	col_time_key	col_varchar_key	col_varchar_nokey
 DROP TABLE t1,t2;
-End of 5.2 tests
+# End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
 #
@@ -7157,9 +7157,10 @@ INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (f2 INT, KEY(f2));
 INSERT INTO t2 VALUES (3);
 CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-3
+ERROR 42000: Can't group on 'sq'
 SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0;
 f2
 3
@@ -7167,9 +7168,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 );
 count(*)
 1
 delete from t1;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-NULL
+ERROR 42000: Can't group on 'sq'
 drop view v2;
 drop table t1,t2;
 #
@@ -7184,6 +7186,29 @@ f1	f2
 foo	bar
 DROP TABLE t1;
 #
+# MDEV-10146: Wrong result (or questionable result and behavior)
+# with aggregate function in uncorrelated SELECT subquery
+#
+CREATE TABLE t1 (f1 INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (f2 int);
+INSERT INTO t2 VALUES (3);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+( SELECT MAX(f1) FROM t2 )
+2
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+( SELECT MAX(f1) FROM t2 )
+2
+INSERT INTO t2 VALUES (4);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+ERROR 21000: Subquery returns more than 1 row
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+ERROR 21000: Subquery returns more than 1 row
+drop view v1;
+drop table t1,t2;
+# End of 10.0 tests
+#
 # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops
 # with UNION in ALL subquery
 #
@@ -7210,7 +7235,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
 f1	f2	f3
 DROP TABLE t1, t2;
 SET NAMES default;
-End of 10.1 tests
+# End of 10.1 tests
 #
 # MDEV-12564: IN TO EXISTS transformation for rows after 
 #             conversion an outer join to inner join
@@ -7224,7 +7249,7 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo
 pk	i	c	pk	i	c
 1	10	foo	1	10	foo
 DROP TABLE t;
-End of 10.2 tests
+# End of 10.2 tests
 set optimizer_switch=default;
 select @@optimizer_switch like '%subquery_cache=on%';
 @@optimizer_switch like '%subquery_cache=on%'
diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result
index f2d97078772..48bf9ce90c9 100644
--- a/mysql-test/r/subselect_no_semijoin.result
+++ b/mysql-test/r/subselect_no_semijoin.result
@@ -4703,7 +4703,7 @@ pk
 SET SESSION sql_mode=@old_sql_mode;
 drop table t2, t1;
 drop view v1;
-End of 5.0 tests.
+# End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));
 create table t_in  (a2 char(2), b2 char(2), c2 char(2));
@@ -5578,7 +5578,7 @@ insert into t2 values ('x'), ('y');
 select * from t2 where a=(select a from t1) and a='x';
 ERROR 21000: Subquery returns more than 1 row
 drop table t1,t2;
-End of 5.1 tests
+# End of 5.1 tests
 #
 # Bug #11765713 58705:
 # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES
@@ -6185,7 +6185,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2
 OR c_sq1_alias1.pk != @var3)) ) AS alias3;
 pk	col_int_nokey	col_int_key	col_time_key	col_varchar_key	col_varchar_nokey
 DROP TABLE t1,t2;
-End of 5.2 tests
+# End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
 #
@@ -7142,9 +7142,10 @@ INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (f2 INT, KEY(f2));
 INSERT INTO t2 VALUES (3);
 CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-3
+ERROR 42000: Can't group on 'sq'
 SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0;
 f2
 3
@@ -7152,9 +7153,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 );
 count(*)
 1
 delete from t1;
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+ERROR 42000: Can't group on 'sq'
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
-sq
-NULL
+ERROR 42000: Can't group on 'sq'
 drop view v2;
 drop table t1,t2;
 #
@@ -7169,6 +7171,29 @@ f1	f2
 foo	bar
 DROP TABLE t1;
 #
+# MDEV-10146: Wrong result (or questionable result and behavior)
+# with aggregate function in uncorrelated SELECT subquery
+#
+CREATE TABLE t1 (f1 INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (f2 int);
+INSERT INTO t2 VALUES (3);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+( SELECT MAX(f1) FROM t2 )
+2
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+( SELECT MAX(f1) FROM t2 )
+2
+INSERT INTO t2 VALUES (4);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+ERROR 21000: Subquery returns more than 1 row
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+ERROR 21000: Subquery returns more than 1 row
+drop view v1;
+drop table t1,t2;
+# End of 10.0 tests
+#
 # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops
 # with UNION in ALL subquery
 #
@@ -7195,7 +7220,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
 f1	f2	f3
 DROP TABLE t1, t2;
 SET NAMES default;
-End of 10.1 tests
+# End of 10.1 tests
 #
 # MDEV-12564: IN TO EXISTS transformation for rows after 
 #             conversion an outer join to inner join
@@ -7209,6 +7234,6 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo
 pk	i	c	pk	i	c
 1	10	foo	1	10	foo
 DROP TABLE t;
-End of 10.2 tests
+# End of 10.2 tests
 set @optimizer_switch_for_subselect_test=null;
 set @join_cache_level_for_subselect_test=NULL;
diff --git a/mysql-test/suite/binlog/r/flashback.result b/mysql-test/suite/binlog/r/flashback.result
index 96729d3bc3c..c96eaebe838 100644
--- a/mysql-test/suite/binlog/r/flashback.result
+++ b/mysql-test/suite/binlog/r/flashback.result
@@ -613,7 +613,7 @@ DROP TABLE t1;
 # Test Case from MDEV-21067
 #
 CREATE DATABASE world;
-CREATE TABLE world.City (
+CREATE TABLE world.city (
 ID INT AUTO_INCREMENT PRIMARY KEY,
 Name VARCHAR(64),
 CountryCode VARCHAR(64),
@@ -625,35 +625,35 @@ ID INT AUTO_INCREMENT PRIMARY KEY,
 REC VARCHAR(64),
 ts TIMESTAMP
 ) ENGINE=InnoDB;
-INSERT INTO world.City VALUES (NULL, 'Davenport', 'USA', 'Iowa', 100);
-INSERT INTO world.City VALUES (NULL, 'Boulder', 'USA', 'Colorado', 1000);
-INSERT INTO world.City VALUES (NULL, 'Gweru', 'ZWE', 'Midlands', 10000);
+INSERT INTO world.city VALUES (NULL, 'Davenport', 'USA', 'Iowa', 100);
+INSERT INTO world.city VALUES (NULL, 'Boulder', 'USA', 'Colorado', 1000);
+INSERT INTO world.city VALUES (NULL, 'Gweru', 'ZWE', 'Midlands', 10000);
 RESET MASTER;
-CHECKSUM TABLE world.City;
+CHECKSUM TABLE world.city;
 Table	Checksum
-world.City	563256876
+world.city	563256876
 INSERT INTO test.test VALUES (NULL, 'Good record 1', CURRENT_TIMESTAMP());
-INSERT INTO world.City VALUES (NULL, 'Wrong value 1', '000', 'Wrong', 0);
-INSERT INTO world.City VALUES (NULL, 'Wrong value 2', '000', 'Wrong', 0) , (NULL, 'Wrong value 3', '000', 'Wrong', 0);
+INSERT INTO world.city VALUES (NULL, 'Wrong value 1', '000', 'Wrong', 0);
+INSERT INTO world.city VALUES (NULL, 'Wrong value 2', '000', 'Wrong', 0) , (NULL, 'Wrong value 3', '000', 'Wrong', 0);
 INSERT INTO test.test VALUES (NULL, 'Good record 2', CURRENT_TIMESTAMP());
-UPDATE world.City SET Population = 99999999 WHERE ID IN (1, 2, 3);
+UPDATE world.city SET Population = 99999999 WHERE ID IN (1, 2, 3);
 INSERT INTO test.test VALUES (NULL, 'Good record 3', CURRENT_TIMESTAMP());
-DELETE FROM world.City WHERE ID BETWEEN 1 AND 2;
+DELETE FROM world.city WHERE ID BETWEEN 1 AND 2;
 INSERT INTO test.test VALUES (NULL, 'Good record 5', CURRENT_TIMESTAMP());
-REPLACE INTO world.City VALUES (4074, 'Wrong value 4', '000', 'Wrong', 0);
-REPLACE INTO world.City VALUES (4078, 'Wrong value 5', '000', 'Wrong', 0), (NULL, 'Wrong value 6', '000', 'Wrong', 0);
+REPLACE INTO world.city VALUES (4074, 'Wrong value 4', '000', 'Wrong', 0);
+REPLACE INTO world.city VALUES (4078, 'Wrong value 5', '000', 'Wrong', 0), (NULL, 'Wrong value 6', '000', 'Wrong', 0);
 INSERT INTO test.test VALUES (NULL, 'Good record 6', CURRENT_TIMESTAMP());
-INSERT INTO world.City
-SELECT NULL, Name, CountryCode, District, Population FROM world.City WHERE ID BETWEEN 2 AND 10;
+INSERT INTO world.city
+SELECT NULL, Name, CountryCode, District, Population FROM world.city WHERE ID BETWEEN 2 AND 10;
 INSERT INTO test.test VALUES (NULL, 'Good record 7', CURRENT_TIMESTAMP());
 INSERT INTO test.test VALUES (NULL, 'Good record 8', CURRENT_TIMESTAMP());
-DELETE FROM world.City;
+DELETE FROM world.city;
 INSERT INTO test.test VALUES (NULL, 'Good record 9', CURRENT_TIMESTAMP());
 FLUSH LOGS;
 # < CASE 6 >
 # Flashback & Check the result
 #
-SELECT * FROM world.City;
+SELECT * FROM world.city;
 ID	Name	CountryCode	District	Population
 1	Davenport	USA	Iowa	100
 2	Boulder	USA	Colorado	1000
@@ -668,11 +668,11 @@ ID	REC	ts
 6	Good record 7	2001-09-09 09:46:40
 7	Good record 8	2001-09-09 09:46:40
 8	Good record 9	2001-09-09 09:46:40
-CHECKSUM TABLE world.City;
+CHECKSUM TABLE world.city;
 Table	Checksum
-world.City	563256876
+world.city	563256876
 DROP TABLE test.test;
-DROP TABLE world.City;
+DROP TABLE world.city;
 DROP DATABASE world;
 SET binlog_format=statement;
 Warnings:
diff --git a/mysql-test/suite/binlog/t/flashback.test b/mysql-test/suite/binlog/t/flashback.test
index 3636276a028..3fc8c44c60c 100644
--- a/mysql-test/suite/binlog/t/flashback.test
+++ b/mysql-test/suite/binlog/t/flashback.test
@@ -260,7 +260,7 @@ DROP TABLE t1;
 
 # Init Structure
 CREATE DATABASE world;
-CREATE TABLE world.City (
+CREATE TABLE world.city (
      ID INT AUTO_INCREMENT PRIMARY KEY,
      Name VARCHAR(64),
      CountryCode VARCHAR(64),
@@ -273,43 +273,43 @@ CREATE TABLE test.test (
      ts TIMESTAMP
 ) ENGINE=InnoDB;
 
-INSERT INTO world.City VALUES (NULL, 'Davenport', 'USA', 'Iowa', 100);
-INSERT INTO world.City VALUES (NULL, 'Boulder', 'USA', 'Colorado', 1000);
-INSERT INTO world.City VALUES (NULL, 'Gweru', 'ZWE', 'Midlands', 10000);
+INSERT INTO world.city VALUES (NULL, 'Davenport', 'USA', 'Iowa', 100);
+INSERT INTO world.city VALUES (NULL, 'Boulder', 'USA', 'Colorado', 1000);
+INSERT INTO world.city VALUES (NULL, 'Gweru', 'ZWE', 'Midlands', 10000);
 
 RESET MASTER;
 
-CHECKSUM TABLE world.City;
+CHECKSUM TABLE world.city;
 
 # Insert test data
 INSERT INTO test.test VALUES (NULL, 'Good record 1', CURRENT_TIMESTAMP());
 
-INSERT INTO world.City VALUES (NULL, 'Wrong value 1', '000', 'Wrong', 0);
-INSERT INTO world.City VALUES (NULL, 'Wrong value 2', '000', 'Wrong', 0) , (NULL, 'Wrong value 3', '000', 'Wrong', 0);
+INSERT INTO world.city VALUES (NULL, 'Wrong value 1', '000', 'Wrong', 0);
+INSERT INTO world.city VALUES (NULL, 'Wrong value 2', '000', 'Wrong', 0) , (NULL, 'Wrong value 3', '000', 'Wrong', 0);
 
 INSERT INTO test.test VALUES (NULL, 'Good record 2', CURRENT_TIMESTAMP());
 
-UPDATE world.City SET Population = 99999999 WHERE ID IN (1, 2, 3);
+UPDATE world.city SET Population = 99999999 WHERE ID IN (1, 2, 3);
 
 INSERT INTO test.test VALUES (NULL, 'Good record 3', CURRENT_TIMESTAMP());
 
-DELETE FROM world.City WHERE ID BETWEEN 1 AND 2;
+DELETE FROM world.city WHERE ID BETWEEN 1 AND 2;
 
 INSERT INTO test.test VALUES (NULL, 'Good record 5', CURRENT_TIMESTAMP());
 
-REPLACE INTO world.City VALUES (4074, 'Wrong value 4', '000', 'Wrong', 0);
-REPLACE INTO world.City VALUES (4078, 'Wrong value 5', '000', 'Wrong', 0), (NULL, 'Wrong value 6', '000', 'Wrong', 0);
+REPLACE INTO world.city VALUES (4074, 'Wrong value 4', '000', 'Wrong', 0);
+REPLACE INTO world.city VALUES (4078, 'Wrong value 5', '000', 'Wrong', 0), (NULL, 'Wrong value 6', '000', 'Wrong', 0);
 
 INSERT INTO test.test VALUES (NULL, 'Good record 6', CURRENT_TIMESTAMP());
 
-INSERT INTO world.City
-SELECT NULL, Name, CountryCode, District, Population FROM world.City WHERE ID BETWEEN 2 AND 10;
+INSERT INTO world.city
+SELECT NULL, Name, CountryCode, District, Population FROM world.city WHERE ID BETWEEN 2 AND 10;
 
 INSERT INTO test.test VALUES (NULL, 'Good record 7', CURRENT_TIMESTAMP());
 
 INSERT INTO test.test VALUES (NULL, 'Good record 8', CURRENT_TIMESTAMP());
 
-DELETE FROM world.City;
+DELETE FROM world.city;
 
 INSERT INTO test.test VALUES (NULL, 'Good record 9', CURRENT_TIMESTAMP());
 
@@ -321,18 +321,18 @@ FLUSH LOGS;
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---exec $MYSQL_BINLOG --database=world --table=City -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_original_6.sql
---exec $MYSQL_BINLOG --database=world --table=City -B $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_6.sql
+--exec $MYSQL_BINLOG --database=world --table=city -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_original_6.sql
+--exec $MYSQL_BINLOG --database=world --table=city -B $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_6.sql
 --exec $MYSQL -e "SET binlog_format= ROW; source $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_6.sql;"
 
-SELECT * FROM world.City;
+SELECT * FROM world.city;
 
 SELECT * FROM test.test;
 
-CHECKSUM TABLE world.City;
+CHECKSUM TABLE world.city;
 
 DROP TABLE test.test;
-DROP TABLE world.City;
+DROP TABLE world.city;
 DROP DATABASE world;
 
 ## Clear
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result b/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result
index 852b300332b..884408d29b3 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result
@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 ANALYZE PARTITION p1,p2;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -48,13 +48,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result b/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result
index 805e4637928..93208147dc4 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result
@@ -34,7 +34,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -56,7 +56,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -97,7 +97,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -119,7 +119,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -160,7 +160,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -182,7 +182,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -223,7 +223,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -245,7 +245,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -286,7 +286,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -308,7 +308,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -349,7 +349,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -371,7 +371,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -412,7 +412,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -434,7 +434,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -475,7 +475,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -497,7 +497,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -538,7 +538,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -560,7 +560,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -601,7 +601,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -623,7 +623,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -664,7 +664,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -686,7 +686,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -727,7 +727,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -749,7 +749,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_check.result b/mysql-test/suite/engines/funcs/r/tc_partition_check.result
index f2e10ec2a06..79592633197 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_check.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_check.result
@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 CHECK PARTITION p1,p2;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -48,13 +48,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_hash.result b/mysql-test/suite/engines/funcs/r/tc_partition_hash.result
index 8c29eb32d90..e7ac578fbfe 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_hash.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_hash.result
@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -24,7 +24,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -39,7 +39,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -54,7 +54,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -69,7 +69,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -84,7 +84,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -99,7 +99,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -114,7 +114,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -129,7 +129,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -144,7 +144,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -159,7 +159,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -174,7 +174,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
@@ -189,7 +189,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -204,7 +204,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -219,7 +219,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -234,7 +234,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -249,7 +249,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -264,7 +264,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -279,7 +279,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -294,7 +294,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -309,7 +309,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -324,7 +324,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -339,7 +339,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -354,7 +354,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -369,7 +369,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -384,7 +384,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -399,7 +399,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -414,7 +414,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -429,7 +429,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -444,7 +444,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -459,7 +459,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -474,7 +474,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -489,7 +489,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -504,7 +504,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -519,7 +519,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -534,7 +534,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -549,7 +549,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -564,7 +564,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -579,7 +579,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -594,7 +594,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -609,7 +609,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -624,7 +624,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -639,7 +639,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -654,7 +654,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -669,7 +669,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -684,7 +684,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -699,7 +699,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -714,7 +714,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -729,7 +729,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -744,7 +744,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -759,7 +759,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -774,7 +774,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -789,7 +789,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -804,7 +804,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -819,7 +819,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -834,7 +834,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -849,7 +849,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -864,7 +864,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -879,7 +879,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -894,7 +894,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -909,7 +909,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -924,7 +924,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -939,7 +939,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -954,7 +954,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -969,7 +969,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -984,7 +984,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -999,7 +999,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1014,7 +1014,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1029,7 +1029,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1044,7 +1044,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1059,7 +1059,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1074,7 +1074,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1089,7 +1089,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1104,7 +1104,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1119,7 +1119,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1134,7 +1134,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1149,7 +1149,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1164,7 +1164,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1179,7 +1179,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1194,7 +1194,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1209,7 +1209,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1224,7 +1224,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1239,7 +1239,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1254,7 +1254,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result b/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result
index 368ba8c0249..96725b7328a 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result
@@ -10,7 +10,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -25,7 +25,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -40,7 +40,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -55,7 +55,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -70,7 +70,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -85,7 +85,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -100,7 +100,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -115,7 +115,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -130,7 +130,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -145,7 +145,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -160,7 +160,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -175,7 +175,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -190,7 +190,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -205,7 +205,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -220,7 +220,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -235,7 +235,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -250,7 +250,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -265,7 +265,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -280,7 +280,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -295,7 +295,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -310,7 +310,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -325,7 +325,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -340,7 +340,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -355,7 +355,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -370,7 +370,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -385,7 +385,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -400,7 +400,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -415,7 +415,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -430,7 +430,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -445,7 +445,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -460,7 +460,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -475,7 +475,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -490,7 +490,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -505,7 +505,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -520,7 +520,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -535,7 +535,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -550,7 +550,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -565,7 +565,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -580,7 +580,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -595,7 +595,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -610,7 +610,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -625,7 +625,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -640,7 +640,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -655,7 +655,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -670,7 +670,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -685,7 +685,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -700,7 +700,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -715,7 +715,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_key.result b/mysql-test/suite/engines/funcs/r/tc_partition_key.result
index 9ca335be0e2..9286b5d9649 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_key.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_key.result
@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -24,7 +24,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -39,7 +39,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -54,7 +54,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -69,7 +69,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -84,7 +84,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -99,7 +99,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -114,7 +114,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -129,7 +129,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -144,7 +144,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -159,7 +159,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -174,7 +174,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -189,7 +189,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -204,7 +204,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -219,7 +219,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -234,7 +234,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -249,7 +249,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -264,7 +264,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -279,7 +279,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -294,7 +294,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -309,7 +309,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -324,7 +324,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -339,7 +339,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -354,7 +354,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -369,7 +369,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -384,7 +384,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -399,7 +399,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -414,7 +414,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -429,7 +429,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -444,7 +444,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -459,7 +459,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -474,7 +474,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -489,7 +489,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -504,7 +504,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -519,7 +519,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -534,7 +534,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -549,7 +549,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -564,7 +564,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -579,7 +579,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -594,7 +594,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -609,7 +609,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -624,7 +624,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -639,7 +639,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -654,7 +654,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -669,7 +669,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -684,7 +684,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -699,7 +699,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -714,7 +714,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result b/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result
index 0a560743832..2eb32646f9f 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result
@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -24,7 +24,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -39,7 +39,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -54,7 +54,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -69,7 +69,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -84,7 +84,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -99,7 +99,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -114,7 +114,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -129,7 +129,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -144,7 +144,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -159,7 +159,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -174,7 +174,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -189,7 +189,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -204,7 +204,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -219,7 +219,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -234,7 +234,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -249,7 +249,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -264,7 +264,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -279,7 +279,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -294,7 +294,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -309,7 +309,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -324,7 +324,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -339,7 +339,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -354,7 +354,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -369,7 +369,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -384,7 +384,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -399,7 +399,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -414,7 +414,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -429,7 +429,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -444,7 +444,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -459,7 +459,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -474,7 +474,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -489,7 +489,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -504,7 +504,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -519,7 +519,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -534,7 +534,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -549,7 +549,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -564,7 +564,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -579,7 +579,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -594,7 +594,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -609,7 +609,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -624,7 +624,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -639,7 +639,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -654,7 +654,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -669,7 +669,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -684,7 +684,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -699,7 +699,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
@@ -714,7 +714,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result b/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result
index c30705c8194..0eb1143ca47 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result
@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 OPTIMIZE PARTITION p1,p2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -46,13 +46,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result b/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result
index bef7ba0635d..9f63c022f36 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result
@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 REBUILD PARTITION p1,p2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -46,13 +46,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_remove.result b/mysql-test/suite/engines/funcs/r/tc_partition_remove.result
index 3ae3439f83c..fcf489d2763 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_remove.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_remove.result
@@ -21,7 +21,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -60,7 +60,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -99,7 +99,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -138,7 +138,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -177,7 +177,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -216,7 +216,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -259,7 +259,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -298,7 +298,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -337,7 +337,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -376,7 +376,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -415,7 +415,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -454,7 +454,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result
index 517c16083b3..22463593106 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result
@@ -44,12 +44,12 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -71,11 +71,11 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -125,12 +125,12 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -152,11 +152,11 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -206,12 +206,12 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -233,11 +233,11 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -287,12 +287,12 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -314,11 +314,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -368,12 +368,12 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -395,11 +395,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -449,12 +449,12 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -476,11 +476,11 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result
index 18f07127cb3..e43e95e928e 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result
@@ -19,7 +19,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -41,7 +41,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SHOW TABLES;
@@ -63,7 +63,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -71,7 +71,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -97,7 +97,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -119,7 +119,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -141,7 +141,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -149,7 +149,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -175,7 +175,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -197,7 +197,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -219,7 +219,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -227,7 +227,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -253,7 +253,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -275,7 +275,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -297,7 +297,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -305,7 +305,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -331,7 +331,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -353,7 +353,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -375,7 +375,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -383,7 +383,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -409,7 +409,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -431,7 +431,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -453,7 +453,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -461,7 +461,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -487,7 +487,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -509,7 +509,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -531,7 +531,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -539,7 +539,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -565,7 +565,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -587,7 +587,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -609,7 +609,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -617,7 +617,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -643,7 +643,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -665,7 +665,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -687,7 +687,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -695,7 +695,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -721,7 +721,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -743,7 +743,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -765,7 +765,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -773,7 +773,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -799,7 +799,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -821,7 +821,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -843,7 +843,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -851,7 +851,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -877,7 +877,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -899,7 +899,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -921,7 +921,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -929,7 +929,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -955,7 +955,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -977,7 +977,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -999,7 +999,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1007,7 +1007,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -1033,7 +1033,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -1055,7 +1055,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -1077,7 +1077,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1085,7 +1085,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -1111,7 +1111,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -1133,7 +1133,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -1155,7 +1155,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1163,7 +1163,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -1189,7 +1189,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -1211,7 +1211,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -1233,7 +1233,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1241,7 +1241,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -1267,7 +1267,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -1289,7 +1289,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -1311,7 +1311,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1319,7 +1319,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -1345,7 +1345,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -1367,7 +1367,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -1389,7 +1389,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1397,7 +1397,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result
index 618b8dd2465..89681d5ec65 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result
@@ -41,10 +41,10 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -63,9 +63,9 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -112,10 +112,10 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -134,9 +134,9 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -183,10 +183,10 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -205,9 +205,9 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -254,10 +254,10 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -276,9 +276,9 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -325,10 +325,10 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -347,9 +347,9 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -396,10 +396,10 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -418,9 +418,9 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_repair.result b/mysql-test/suite/engines/funcs/r/tc_partition_repair.result
index 98d9aa93740..d51bd86b715 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_repair.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_repair.result
@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 REPAIR PARTITION p1,p2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -46,13 +46,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result b/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result
index 6d1dc41a354..be47aaadd40 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result
@@ -45,12 +45,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -100,12 +100,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -155,12 +155,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -210,12 +210,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -265,12 +265,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -320,12 +320,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result b/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result
index c6a0d9aac68..543b3471092 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result
@@ -53,17 +53,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -121,17 +121,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -189,17 +189,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -257,17 +257,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -325,17 +325,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -393,17 +393,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_value.result b/mysql-test/suite/engines/funcs/r/tc_partition_value.result
index 98a5f885e4b..48891fc368d 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_value.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_value.result
@@ -15,13 +15,13 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -41,13 +41,13 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -67,13 +67,13 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -93,13 +93,13 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -119,13 +119,13 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result b/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result
index 71a38814fd8..0d9393ffeda 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result
@@ -13,11 +13,11 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LIST (c1)
-(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
- PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
- PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
+ PARTITION BY LIST (`c1`)
+(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
+ PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
+ PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
+ PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -35,11 +35,11 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LIST (c1)
-(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
- PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
- PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
+ PARTITION BY LIST (`c1`)
+(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
+ PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
+ PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
+ PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -57,11 +57,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LIST (c1)
-(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
- PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
- PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
+ PARTITION BY LIST (`c1`)
+(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
+ PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
+ PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
+ PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -79,11 +79,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LIST (c1)
-(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
- PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
- PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
+ PARTITION BY LIST (`c1`)
+(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
+ PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
+ PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
+ PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -101,11 +101,11 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LIST (c1)
-(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
- PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
- PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
+ PARTITION BY LIST (`c1`)
+(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
+ PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
+ PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
+ PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/parts/r/longname.result b/mysql-test/suite/parts/r/longname.result
new file mode 100644
index 00000000000..c95e666625e
--- /dev/null
+++ b/mysql-test/suite/parts/r/longname.result
@@ -0,0 +1,28 @@
+set names utf8;
+create database mysqltest1;
+select database_name, table_name, length(table_name) from mysql.innodb_table_stats where database_name = 'mysqltest1';
+database_name	table_name	length(table_name)
+CREATE TABLE mysqltest1.test_jfg_table_name_with_64_chars_123456789012345678901234567890 (
+id int(10) unsigned NOT NULL,
+id2 int(10) unsigned NOT NULL,
+PRIMARY KEY ( id, id2 )
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+PARTITION BY RANGE ( id )
+SUBPARTITION BY HASH ( id2 )
+SUBPARTITIONS 2 (
+PARTITION test_jfg_partition_name_with_60_chars_1234567890123456789012 VALUES LESS THAN (1000) ENGINE = InnoDB,
+PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB);
+select database_name, table_name, length(table_name) from mysql.innodb_table_stats where database_name = 'mysqltest1';
+database_name	table_name	length(table_name)
+CREATE TABLE mysqltest1.éééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé (
+id int(10) unsigned NOT NULL,
+id2 int(10) unsigned NOT NULL,
+PRIMARY KEY ( id, id2 )
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+PARTITION BY RANGE ( id )
+SUBPARTITION BY HASH ( id2 )
+SUBPARTITIONS 2 (
+PARTITION çççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç VALUES LESS THAN (1000) ENGINE = InnoDB,
+PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB);
+ERROR HY000: The path specified for @0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@ is too long
+drop database mysqltest1;
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result b/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
index d25371615ef..a1dad1b34b3 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
@@ -56,14 +56,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = InnoDB,
- PARTITION partB ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB,
- PARTITION PartD ENGINE = InnoDB,
- PARTITION partE ENGINE = InnoDB,
- PARTITION Partf ENGINE = InnoDB,
- PARTITION PartG ENGINE = InnoDB)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = InnoDB,
+ PARTITION `partB` ENGINE = InnoDB,
+ PARTITION `Partc` ENGINE = InnoDB,
+ PARTITION `PartD` ENGINE = InnoDB,
+ PARTITION `partE` ENGINE = InnoDB,
+ PARTITION `Partf` ENGINE = InnoDB,
+ PARTITION `PartG` ENGINE = InnoDB)
 ALTER TABLE TableA COALESCE PARTITION 4;
 SELECT * FROM TableA;
 a
@@ -84,10 +84,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = InnoDB,
- PARTITION partB ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = InnoDB,
+ PARTITION `partB` ENGINE = InnoDB,
+ PARTITION `Partc` ENGINE = InnoDB)
 # Test of EXCHANGE PARTITION WITH TABLE
 SELECT PARTITION_NAME, TABLE_ROWS FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA ='MySQL_Test_DB' AND TABLE_NAME = 'TableA';
 PARTITION_NAME	TABLE_ROWS
@@ -112,10 +112,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = InnoDB,
- PARTITION partB ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = InnoDB,
+ PARTITION `partB` ENGINE = InnoDB,
+ PARTITION `Partc` ENGINE = InnoDB)
 SELECT * FROM TableB;
 a
 10
@@ -156,10 +156,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = InnoDB,
- PARTITION partB ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = InnoDB,
+ PARTITION `partB` ENGINE = InnoDB,
+ PARTITION `Partc` ENGINE = InnoDB)
 # Test of REORGANIZE PARTITIONS
 # Should not work on HASH/KEY
 ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO
@@ -192,10 +192,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB)
+ PARTITION BY KEY (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = InnoDB,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = InnoDB,
+ PARTITION `Partc` ENGINE = InnoDB)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -264,10 +264,10 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB)
+ PARTITION BY KEY (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = InnoDB,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = InnoDB,
+ PARTITION `Partc` ENGINE = InnoDB)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -355,14 +355,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION parta ENGINE = InnoDB,
- PARTITION partB ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB,
- PARTITION PartD ENGINE = InnoDB,
- PARTITION partE ENGINE = InnoDB,
- PARTITION Partf ENGINE = InnoDB,
- PARTITION PartG ENGINE = InnoDB)
+ PARTITION BY HASH (`a`)
+(PARTITION `parta` ENGINE = InnoDB,
+ PARTITION `partB` ENGINE = InnoDB,
+ PARTITION `Partc` ENGINE = InnoDB,
+ PARTITION `PartD` ENGINE = InnoDB,
+ PARTITION `partE` ENGINE = InnoDB,
+ PARTITION `Partf` ENGINE = InnoDB,
+ PARTITION `PartG` ENGINE = InnoDB)
 ALTER TABLE TableA COALESCE PARTITION 4;
 SELECT * FROM TableA;
 a
@@ -383,10 +383,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION parta ENGINE = InnoDB,
- PARTITION partB ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB)
+ PARTITION BY HASH (`a`)
+(PARTITION `parta` ENGINE = InnoDB,
+ PARTITION `partB` ENGINE = InnoDB,
+ PARTITION `Partc` ENGINE = InnoDB)
 # Test of REORGANIZE PARTITIONS
 # Should not work on HASH/KEY
 ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO
@@ -419,10 +419,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB)
+ PARTITION BY HASH (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = InnoDB,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = InnoDB,
+ PARTITION `Partc` ENGINE = InnoDB)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -491,10 +491,10 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB)
+ PARTITION BY HASH (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = InnoDB,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = InnoDB,
+ PARTITION `Partc` ENGINE = InnoDB)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -571,14 +571,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB,
- PARTITION partB VALUES LESS THAN (7) ENGINE = InnoDB,
- PARTITION Partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION PartD VALUES LESS THAN (13) ENGINE = InnoDB,
- PARTITION partE VALUES LESS THAN (16) ENGINE = InnoDB,
- PARTITION Partf VALUES LESS THAN (19) ENGINE = InnoDB,
- PARTITION PartG VALUES LESS THAN (22) ENGINE = InnoDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = InnoDB,
+ PARTITION `partB` VALUES LESS THAN (7) ENGINE = InnoDB,
+ PARTITION `Partc` VALUES LESS THAN (10) ENGINE = InnoDB,
+ PARTITION `PartD` VALUES LESS THAN (13) ENGINE = InnoDB,
+ PARTITION `partE` VALUES LESS THAN (16) ENGINE = InnoDB,
+ PARTITION `Partf` VALUES LESS THAN (19) ENGINE = InnoDB,
+ PARTITION `PartG` VALUES LESS THAN (22) ENGINE = InnoDB)
 ALTER TABLE TableA DROP PARTITION partE, PartG;
 ALTER TABLE TableA DROP PARTITION Partf;
 ALTER TABLE TableA ADD PARTITION
@@ -602,12 +602,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB,
- PARTITION partB VALUES LESS THAN (7) ENGINE = InnoDB,
- PARTITION Partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION PartD VALUES LESS THAN (13) ENGINE = InnoDB,
- PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = InnoDB,
+ PARTITION `partB` VALUES LESS THAN (7) ENGINE = InnoDB,
+ PARTITION `Partc` VALUES LESS THAN (10) ENGINE = InnoDB,
+ PARTITION `PartD` VALUES LESS THAN (13) ENGINE = InnoDB,
+ PARTITION `PartE` VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 # Test of REORGANIZE PARTITIONS
 # Error since it must reorganize a consecutive range
 ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO
@@ -640,11 +640,11 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB,
- PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = InnoDB,
- PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = InnoDB,
- PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = InnoDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = InnoDB,
+ PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = InnoDB,
+ PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = InnoDB,
+ PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = InnoDB)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -713,11 +713,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB,
- PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = InnoDB,
- PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = InnoDB,
- PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = InnoDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = InnoDB,
+ PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = InnoDB,
+ PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = InnoDB,
+ PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = InnoDB)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -794,14 +794,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION parta VALUES IN (1,8,9) ENGINE = InnoDB,
- PARTITION partB VALUES IN (2,10,11) ENGINE = InnoDB,
- PARTITION Partc VALUES IN (3,4,7) ENGINE = InnoDB,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB,
- PARTITION partE VALUES IN (16) ENGINE = InnoDB,
- PARTITION Partf VALUES IN (19) ENGINE = InnoDB,
- PARTITION PartG VALUES IN (22) ENGINE = InnoDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `parta` VALUES IN (1,8,9) ENGINE = InnoDB,
+ PARTITION `partB` VALUES IN (2,10,11) ENGINE = InnoDB,
+ PARTITION `Partc` VALUES IN (3,4,7) ENGINE = InnoDB,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = InnoDB,
+ PARTITION `partE` VALUES IN (16) ENGINE = InnoDB,
+ PARTITION `Partf` VALUES IN (19) ENGINE = InnoDB,
+ PARTITION `PartG` VALUES IN (22) ENGINE = InnoDB)
 ALTER TABLE TableA DROP PARTITION partE, PartG;
 ALTER TABLE TableA DROP PARTITION Partf;
 ALTER TABLE TableA ADD PARTITION
@@ -825,12 +825,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION parta VALUES IN (1,8,9) ENGINE = InnoDB,
- PARTITION partB VALUES IN (2,10,11) ENGINE = InnoDB,
- PARTITION Partc VALUES IN (3,4,7) ENGINE = InnoDB,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB,
- PARTITION PartE VALUES IN (13) ENGINE = InnoDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `parta` VALUES IN (1,8,9) ENGINE = InnoDB,
+ PARTITION `partB` VALUES IN (2,10,11) ENGINE = InnoDB,
+ PARTITION `Partc` VALUES IN (3,4,7) ENGINE = InnoDB,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = InnoDB,
+ PARTITION `PartE` VALUES IN (13) ENGINE = InnoDB)
 # Test of REORGANIZE PARTITIONS
 ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO
 (PARTITION Partc VALUES IN (1,7) 
@@ -863,12 +863,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = InnoDB,
- PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = InnoDB,
- PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = InnoDB,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB,
- PARTITION PartE VALUES IN (13) ENGINE = InnoDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = InnoDB,
+ PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = InnoDB,
+ PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = InnoDB,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = InnoDB,
+ PARTITION `PartE` VALUES IN (13) ENGINE = InnoDB)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -928,12 +928,12 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = InnoDB,
- PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = InnoDB,
- PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = InnoDB,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB,
- PARTITION PartE VALUES IN (13) ENGINE = InnoDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = InnoDB,
+ PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = InnoDB,
+ PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = InnoDB,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = InnoDB,
+ PARTITION `PartE` VALUES IN (13) ENGINE = InnoDB)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -971,10 +971,10 @@ t1	CREATE TABLE `t1` (
   `b` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2002 DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION LT1000 VALUES LESS THAN (1000) ENGINE = InnoDB,
- PARTITION LT2000 VALUES LESS THAN (2000) ENGINE = InnoDB,
- PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `LT1000` VALUES LESS THAN (1000) ENGINE = InnoDB,
+ PARTITION `LT2000` VALUES LESS THAN (2000) ENGINE = InnoDB,
+ PARTITION `MAX` VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	First
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result b/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
index 076079ccb00..88f59da8f13 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
@@ -56,14 +56,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = MEMORY,
- PARTITION partB ENGINE = MEMORY,
- PARTITION Partc ENGINE = MEMORY,
- PARTITION PartD ENGINE = MEMORY,
- PARTITION partE ENGINE = MEMORY,
- PARTITION Partf ENGINE = MEMORY,
- PARTITION PartG ENGINE = MEMORY)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = MEMORY,
+ PARTITION `partB` ENGINE = MEMORY,
+ PARTITION `Partc` ENGINE = MEMORY,
+ PARTITION `PartD` ENGINE = MEMORY,
+ PARTITION `partE` ENGINE = MEMORY,
+ PARTITION `Partf` ENGINE = MEMORY,
+ PARTITION `PartG` ENGINE = MEMORY)
 ALTER TABLE TableA COALESCE PARTITION 4;
 SELECT * FROM TableA;
 a
@@ -84,10 +84,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = MEMORY,
- PARTITION partB ENGINE = MEMORY,
- PARTITION Partc ENGINE = MEMORY)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = MEMORY,
+ PARTITION `partB` ENGINE = MEMORY,
+ PARTITION `Partc` ENGINE = MEMORY)
 # Test of EXCHANGE PARTITION WITH TABLE
 SELECT PARTITION_NAME, TABLE_ROWS FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA ='MySQL_Test_DB' AND TABLE_NAME = 'TableA';
 PARTITION_NAME	TABLE_ROWS
@@ -112,10 +112,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = MEMORY,
- PARTITION partB ENGINE = MEMORY,
- PARTITION Partc ENGINE = MEMORY)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = MEMORY,
+ PARTITION `partB` ENGINE = MEMORY,
+ PARTITION `Partc` ENGINE = MEMORY)
 SELECT * FROM TableB;
 a
 10
@@ -156,10 +156,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = MEMORY,
- PARTITION partB ENGINE = MEMORY,
- PARTITION Partc ENGINE = MEMORY)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = MEMORY,
+ PARTITION `partB` ENGINE = MEMORY,
+ PARTITION `Partc` ENGINE = MEMORY)
 # Test of REORGANIZE PARTITIONS
 # Should not work on HASH/KEY
 ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO
@@ -192,10 +192,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY,
- PARTITION Partc ENGINE = MEMORY)
+ PARTITION BY KEY (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MEMORY,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MEMORY,
+ PARTITION `Partc` ENGINE = MEMORY)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -264,10 +264,10 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY,
- PARTITION Partc ENGINE = MEMORY)
+ PARTITION BY KEY (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MEMORY,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MEMORY,
+ PARTITION `Partc` ENGINE = MEMORY)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -355,14 +355,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION parta ENGINE = MEMORY,
- PARTITION partB ENGINE = MEMORY,
- PARTITION Partc ENGINE = MEMORY,
- PARTITION PartD ENGINE = MEMORY,
- PARTITION partE ENGINE = MEMORY,
- PARTITION Partf ENGINE = MEMORY,
- PARTITION PartG ENGINE = MEMORY)
+ PARTITION BY HASH (`a`)
+(PARTITION `parta` ENGINE = MEMORY,
+ PARTITION `partB` ENGINE = MEMORY,
+ PARTITION `Partc` ENGINE = MEMORY,
+ PARTITION `PartD` ENGINE = MEMORY,
+ PARTITION `partE` ENGINE = MEMORY,
+ PARTITION `Partf` ENGINE = MEMORY,
+ PARTITION `PartG` ENGINE = MEMORY)
 ALTER TABLE TableA COALESCE PARTITION 4;
 SELECT * FROM TableA;
 a
@@ -383,10 +383,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION parta ENGINE = MEMORY,
- PARTITION partB ENGINE = MEMORY,
- PARTITION Partc ENGINE = MEMORY)
+ PARTITION BY HASH (`a`)
+(PARTITION `parta` ENGINE = MEMORY,
+ PARTITION `partB` ENGINE = MEMORY,
+ PARTITION `Partc` ENGINE = MEMORY)
 # Test of REORGANIZE PARTITIONS
 # Should not work on HASH/KEY
 ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO
@@ -419,10 +419,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY,
- PARTITION Partc ENGINE = MEMORY)
+ PARTITION BY HASH (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MEMORY,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MEMORY,
+ PARTITION `Partc` ENGINE = MEMORY)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -491,10 +491,10 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY,
- PARTITION Partc ENGINE = MEMORY)
+ PARTITION BY HASH (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MEMORY,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MEMORY,
+ PARTITION `Partc` ENGINE = MEMORY)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -571,14 +571,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = MEMORY,
- PARTITION partB VALUES LESS THAN (7) ENGINE = MEMORY,
- PARTITION Partc VALUES LESS THAN (10) ENGINE = MEMORY,
- PARTITION PartD VALUES LESS THAN (13) ENGINE = MEMORY,
- PARTITION partE VALUES LESS THAN (16) ENGINE = MEMORY,
- PARTITION Partf VALUES LESS THAN (19) ENGINE = MEMORY,
- PARTITION PartG VALUES LESS THAN (22) ENGINE = MEMORY)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MEMORY,
+ PARTITION `partB` VALUES LESS THAN (7) ENGINE = MEMORY,
+ PARTITION `Partc` VALUES LESS THAN (10) ENGINE = MEMORY,
+ PARTITION `PartD` VALUES LESS THAN (13) ENGINE = MEMORY,
+ PARTITION `partE` VALUES LESS THAN (16) ENGINE = MEMORY,
+ PARTITION `Partf` VALUES LESS THAN (19) ENGINE = MEMORY,
+ PARTITION `PartG` VALUES LESS THAN (22) ENGINE = MEMORY)
 ALTER TABLE TableA DROP PARTITION partE, PartG;
 ALTER TABLE TableA DROP PARTITION Partf;
 ALTER TABLE TableA ADD PARTITION
@@ -602,12 +602,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = MEMORY,
- PARTITION partB VALUES LESS THAN (7) ENGINE = MEMORY,
- PARTITION Partc VALUES LESS THAN (10) ENGINE = MEMORY,
- PARTITION PartD VALUES LESS THAN (13) ENGINE = MEMORY,
- PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = MEMORY)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MEMORY,
+ PARTITION `partB` VALUES LESS THAN (7) ENGINE = MEMORY,
+ PARTITION `Partc` VALUES LESS THAN (10) ENGINE = MEMORY,
+ PARTITION `PartD` VALUES LESS THAN (13) ENGINE = MEMORY,
+ PARTITION `PartE` VALUES LESS THAN MAXVALUE ENGINE = MEMORY)
 # Test of REORGANIZE PARTITIONS
 # Error since it must reorganize a consecutive range
 ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO
@@ -640,11 +640,11 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = MEMORY,
- PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MEMORY,
- PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MEMORY,
- PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MEMORY)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MEMORY,
+ PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MEMORY,
+ PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MEMORY,
+ PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MEMORY)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -713,11 +713,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = MEMORY,
- PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MEMORY,
- PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MEMORY,
- PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MEMORY)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MEMORY,
+ PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MEMORY,
+ PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MEMORY,
+ PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MEMORY)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -794,14 +794,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION parta VALUES IN (1,8,9) ENGINE = MEMORY,
- PARTITION partB VALUES IN (2,10,11) ENGINE = MEMORY,
- PARTITION Partc VALUES IN (3,4,7) ENGINE = MEMORY,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = MEMORY,
- PARTITION partE VALUES IN (16) ENGINE = MEMORY,
- PARTITION Partf VALUES IN (19) ENGINE = MEMORY,
- PARTITION PartG VALUES IN (22) ENGINE = MEMORY)
+ PARTITION BY LIST (`a`)
+(PARTITION `parta` VALUES IN (1,8,9) ENGINE = MEMORY,
+ PARTITION `partB` VALUES IN (2,10,11) ENGINE = MEMORY,
+ PARTITION `Partc` VALUES IN (3,4,7) ENGINE = MEMORY,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MEMORY,
+ PARTITION `partE` VALUES IN (16) ENGINE = MEMORY,
+ PARTITION `Partf` VALUES IN (19) ENGINE = MEMORY,
+ PARTITION `PartG` VALUES IN (22) ENGINE = MEMORY)
 ALTER TABLE TableA DROP PARTITION partE, PartG;
 ALTER TABLE TableA DROP PARTITION Partf;
 ALTER TABLE TableA ADD PARTITION
@@ -825,12 +825,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION parta VALUES IN (1,8,9) ENGINE = MEMORY,
- PARTITION partB VALUES IN (2,10,11) ENGINE = MEMORY,
- PARTITION Partc VALUES IN (3,4,7) ENGINE = MEMORY,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = MEMORY,
- PARTITION PartE VALUES IN (13) ENGINE = MEMORY)
+ PARTITION BY LIST (`a`)
+(PARTITION `parta` VALUES IN (1,8,9) ENGINE = MEMORY,
+ PARTITION `partB` VALUES IN (2,10,11) ENGINE = MEMORY,
+ PARTITION `Partc` VALUES IN (3,4,7) ENGINE = MEMORY,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MEMORY,
+ PARTITION `PartE` VALUES IN (13) ENGINE = MEMORY)
 # Test of REORGANIZE PARTITIONS
 ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO
 (PARTITION Partc VALUES IN (1,7) 
@@ -863,12 +863,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MEMORY,
- PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MEMORY,
- PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MEMORY,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = MEMORY,
- PARTITION PartE VALUES IN (13) ENGINE = MEMORY)
+ PARTITION BY LIST (`a`)
+(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MEMORY,
+ PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MEMORY,
+ PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MEMORY,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MEMORY,
+ PARTITION `PartE` VALUES IN (13) ENGINE = MEMORY)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -928,12 +928,12 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MEMORY,
- PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MEMORY,
- PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MEMORY,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = MEMORY,
- PARTITION PartE VALUES IN (13) ENGINE = MEMORY)
+ PARTITION BY LIST (`a`)
+(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MEMORY,
+ PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MEMORY,
+ PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MEMORY,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MEMORY,
+ PARTITION `PartE` VALUES IN (13) ENGINE = MEMORY)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -971,10 +971,10 @@ t1	CREATE TABLE `t1` (
   `b` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MEMORY AUTO_INCREMENT=2002 DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION LT1000 VALUES LESS THAN (1000) ENGINE = MEMORY,
- PARTITION LT2000 VALUES LESS THAN (2000) ENGINE = MEMORY,
- PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = MEMORY)
+ PARTITION BY RANGE (`a`)
+(PARTITION `LT1000` VALUES LESS THAN (1000) ENGINE = MEMORY,
+ PARTITION `LT2000` VALUES LESS THAN (2000) ENGINE = MEMORY,
+ PARTITION `MAX` VALUES LESS THAN MAXVALUE ENGINE = MEMORY)
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	First
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result b/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
index e01f0e8d440..a498d4667b1 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
@@ -56,14 +56,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = MyISAM,
- PARTITION partB ENGINE = MyISAM,
- PARTITION Partc ENGINE = MyISAM,
- PARTITION PartD ENGINE = MyISAM,
- PARTITION partE ENGINE = MyISAM,
- PARTITION Partf ENGINE = MyISAM,
- PARTITION PartG ENGINE = MyISAM)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = MyISAM,
+ PARTITION `partB` ENGINE = MyISAM,
+ PARTITION `Partc` ENGINE = MyISAM,
+ PARTITION `PartD` ENGINE = MyISAM,
+ PARTITION `partE` ENGINE = MyISAM,
+ PARTITION `Partf` ENGINE = MyISAM,
+ PARTITION `PartG` ENGINE = MyISAM)
 ALTER TABLE TableA COALESCE PARTITION 4;
 SELECT * FROM TableA;
 a
@@ -84,10 +84,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = MyISAM,
- PARTITION partB ENGINE = MyISAM,
- PARTITION Partc ENGINE = MyISAM)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = MyISAM,
+ PARTITION `partB` ENGINE = MyISAM,
+ PARTITION `Partc` ENGINE = MyISAM)
 # Test of EXCHANGE PARTITION WITH TABLE
 SELECT PARTITION_NAME, TABLE_ROWS FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA ='MySQL_Test_DB' AND TABLE_NAME = 'TableA';
 PARTITION_NAME	TABLE_ROWS
@@ -112,10 +112,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = MyISAM,
- PARTITION partB ENGINE = MyISAM,
- PARTITION Partc ENGINE = MyISAM)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = MyISAM,
+ PARTITION `partB` ENGINE = MyISAM,
+ PARTITION `Partc` ENGINE = MyISAM)
 SELECT * FROM TableB;
 a
 10
@@ -156,10 +156,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION parta ENGINE = MyISAM,
- PARTITION partB ENGINE = MyISAM,
- PARTITION Partc ENGINE = MyISAM)
+ PARTITION BY KEY (`a`)
+(PARTITION `parta` ENGINE = MyISAM,
+ PARTITION `partB` ENGINE = MyISAM,
+ PARTITION `Partc` ENGINE = MyISAM)
 # Test of REORGANIZE PARTITIONS
 # Should not work on HASH/KEY
 ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO
@@ -192,10 +192,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM,
- PARTITION Partc ENGINE = MyISAM)
+ PARTITION BY KEY (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MyISAM,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MyISAM,
+ PARTITION `Partc` ENGINE = MyISAM)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -264,10 +264,10 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY KEY (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM,
- PARTITION Partc ENGINE = MyISAM)
+ PARTITION BY KEY (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MyISAM,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MyISAM,
+ PARTITION `Partc` ENGINE = MyISAM)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -355,14 +355,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION parta ENGINE = MyISAM,
- PARTITION partB ENGINE = MyISAM,
- PARTITION Partc ENGINE = MyISAM,
- PARTITION PartD ENGINE = MyISAM,
- PARTITION partE ENGINE = MyISAM,
- PARTITION Partf ENGINE = MyISAM,
- PARTITION PartG ENGINE = MyISAM)
+ PARTITION BY HASH (`a`)
+(PARTITION `parta` ENGINE = MyISAM,
+ PARTITION `partB` ENGINE = MyISAM,
+ PARTITION `Partc` ENGINE = MyISAM,
+ PARTITION `PartD` ENGINE = MyISAM,
+ PARTITION `partE` ENGINE = MyISAM,
+ PARTITION `Partf` ENGINE = MyISAM,
+ PARTITION `PartG` ENGINE = MyISAM)
 ALTER TABLE TableA COALESCE PARTITION 4;
 SELECT * FROM TableA;
 a
@@ -383,10 +383,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION parta ENGINE = MyISAM,
- PARTITION partB ENGINE = MyISAM,
- PARTITION Partc ENGINE = MyISAM)
+ PARTITION BY HASH (`a`)
+(PARTITION `parta` ENGINE = MyISAM,
+ PARTITION `partB` ENGINE = MyISAM,
+ PARTITION `Partc` ENGINE = MyISAM)
 # Test of REORGANIZE PARTITIONS
 # Should not work on HASH/KEY
 ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO
@@ -419,10 +419,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM,
- PARTITION Partc ENGINE = MyISAM)
+ PARTITION BY HASH (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MyISAM,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MyISAM,
+ PARTITION `Partc` ENGINE = MyISAM)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -491,10 +491,10 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
-(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM,
- PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM,
- PARTITION Partc ENGINE = MyISAM)
+ PARTITION BY HASH (`a`)
+(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MyISAM,
+ PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MyISAM,
+ PARTITION `Partc` ENGINE = MyISAM)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -571,14 +571,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = MyISAM,
- PARTITION partB VALUES LESS THAN (7) ENGINE = MyISAM,
- PARTITION Partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION PartD VALUES LESS THAN (13) ENGINE = MyISAM,
- PARTITION partE VALUES LESS THAN (16) ENGINE = MyISAM,
- PARTITION Partf VALUES LESS THAN (19) ENGINE = MyISAM,
- PARTITION PartG VALUES LESS THAN (22) ENGINE = MyISAM)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MyISAM,
+ PARTITION `partB` VALUES LESS THAN (7) ENGINE = MyISAM,
+ PARTITION `Partc` VALUES LESS THAN (10) ENGINE = MyISAM,
+ PARTITION `PartD` VALUES LESS THAN (13) ENGINE = MyISAM,
+ PARTITION `partE` VALUES LESS THAN (16) ENGINE = MyISAM,
+ PARTITION `Partf` VALUES LESS THAN (19) ENGINE = MyISAM,
+ PARTITION `PartG` VALUES LESS THAN (22) ENGINE = MyISAM)
 ALTER TABLE TableA DROP PARTITION partE, PartG;
 ALTER TABLE TableA DROP PARTITION Partf;
 ALTER TABLE TableA ADD PARTITION
@@ -602,12 +602,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = MyISAM,
- PARTITION partB VALUES LESS THAN (7) ENGINE = MyISAM,
- PARTITION Partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION PartD VALUES LESS THAN (13) ENGINE = MyISAM,
- PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MyISAM,
+ PARTITION `partB` VALUES LESS THAN (7) ENGINE = MyISAM,
+ PARTITION `Partc` VALUES LESS THAN (10) ENGINE = MyISAM,
+ PARTITION `PartD` VALUES LESS THAN (13) ENGINE = MyISAM,
+ PARTITION `PartE` VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 # Test of REORGANIZE PARTITIONS
 # Error since it must reorganize a consecutive range
 ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO
@@ -640,11 +640,11 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = MyISAM,
- PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MyISAM,
- PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MyISAM,
- PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MyISAM)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MyISAM,
+ PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MyISAM,
+ PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MyISAM,
+ PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MyISAM)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -713,11 +713,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION parta VALUES LESS THAN (4) ENGINE = MyISAM,
- PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MyISAM,
- PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MyISAM,
- PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MyISAM)
+ PARTITION BY RANGE (`a`)
+(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MyISAM,
+ PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MyISAM,
+ PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MyISAM,
+ PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MyISAM)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -794,14 +794,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION parta VALUES IN (1,8,9) ENGINE = MyISAM,
- PARTITION partB VALUES IN (2,10,11) ENGINE = MyISAM,
- PARTITION Partc VALUES IN (3,4,7) ENGINE = MyISAM,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = MyISAM,
- PARTITION partE VALUES IN (16) ENGINE = MyISAM,
- PARTITION Partf VALUES IN (19) ENGINE = MyISAM,
- PARTITION PartG VALUES IN (22) ENGINE = MyISAM)
+ PARTITION BY LIST (`a`)
+(PARTITION `parta` VALUES IN (1,8,9) ENGINE = MyISAM,
+ PARTITION `partB` VALUES IN (2,10,11) ENGINE = MyISAM,
+ PARTITION `Partc` VALUES IN (3,4,7) ENGINE = MyISAM,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MyISAM,
+ PARTITION `partE` VALUES IN (16) ENGINE = MyISAM,
+ PARTITION `Partf` VALUES IN (19) ENGINE = MyISAM,
+ PARTITION `PartG` VALUES IN (22) ENGINE = MyISAM)
 ALTER TABLE TableA DROP PARTITION partE, PartG;
 ALTER TABLE TableA DROP PARTITION Partf;
 ALTER TABLE TableA ADD PARTITION
@@ -825,12 +825,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION parta VALUES IN (1,8,9) ENGINE = MyISAM,
- PARTITION partB VALUES IN (2,10,11) ENGINE = MyISAM,
- PARTITION Partc VALUES IN (3,4,7) ENGINE = MyISAM,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = MyISAM,
- PARTITION PartE VALUES IN (13) ENGINE = MyISAM)
+ PARTITION BY LIST (`a`)
+(PARTITION `parta` VALUES IN (1,8,9) ENGINE = MyISAM,
+ PARTITION `partB` VALUES IN (2,10,11) ENGINE = MyISAM,
+ PARTITION `Partc` VALUES IN (3,4,7) ENGINE = MyISAM,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MyISAM,
+ PARTITION `PartE` VALUES IN (13) ENGINE = MyISAM)
 # Test of REORGANIZE PARTITIONS
 ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO
 (PARTITION Partc VALUES IN (1,7) 
@@ -863,12 +863,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MyISAM,
- PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MyISAM,
- PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MyISAM,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = MyISAM,
- PARTITION PartE VALUES IN (13) ENGINE = MyISAM)
+ PARTITION BY LIST (`a`)
+(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MyISAM,
+ PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MyISAM,
+ PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MyISAM,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MyISAM,
+ PARTITION `PartE` VALUES IN (13) ENGINE = MyISAM)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -928,12 +928,12 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MyISAM,
- PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MyISAM,
- PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MyISAM,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = MyISAM,
- PARTITION PartE VALUES IN (13) ENGINE = MyISAM)
+ PARTITION BY LIST (`a`)
+(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MyISAM,
+ PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MyISAM,
+ PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MyISAM,
+ PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MyISAM,
+ PARTITION `PartE` VALUES IN (13) ENGINE = MyISAM)
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
@@ -971,10 +971,10 @@ t1	CREATE TABLE `t1` (
   `b` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2002 DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION LT1000 VALUES LESS THAN (1000) ENGINE = MyISAM,
- PARTITION LT2000 VALUES LESS THAN (2000) ENGINE = MyISAM,
- PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
+ PARTITION BY RANGE (`a`)
+(PARTITION `LT1000` VALUES LESS THAN (1000) ENGINE = MyISAM,
+ PARTITION `LT2000` VALUES LESS THAN (2000) ENGINE = MyISAM,
+ PARTITION `MAX` VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	First
diff --git a/mysql-test/suite/parts/t/longname.test b/mysql-test/suite/parts/t/longname.test
new file mode 100644
index 00000000000..0f7378ef8e3
--- /dev/null
+++ b/mysql-test/suite/parts/t/longname.test
@@ -0,0 +1,32 @@
+source include/have_innodb.inc;
+source include/have_partition.inc;
+set names utf8;
+
+create database mysqltest1;
+select database_name, table_name, length(table_name) from mysql.innodb_table_stats where database_name = 'mysqltest1';
+CREATE TABLE mysqltest1.test_jfg_table_name_with_64_chars_123456789012345678901234567890 (
+  id int(10) unsigned NOT NULL,
+  id2 int(10) unsigned NOT NULL,
+  PRIMARY KEY ( id, id2 )
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+PARTITION BY RANGE ( id )
+  SUBPARTITION BY HASH ( id2 )
+  SUBPARTITIONS 2 (
+  PARTITION test_jfg_partition_name_with_60_chars_1234567890123456789012 VALUES LESS THAN (1000) ENGINE = InnoDB,
+  PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB);
+
+select database_name, table_name, length(table_name) from mysql.innodb_table_stats where database_name = 'mysqltest1';
+
+--error ER_PATH_LENGTH
+CREATE TABLE mysqltest1.éééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé (
+  id int(10) unsigned NOT NULL,
+  id2 int(10) unsigned NOT NULL,
+  PRIMARY KEY ( id, id2 )
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+PARTITION BY RANGE ( id )
+  SUBPARTITION BY HASH ( id2 )
+  SUBPARTITIONS 2 (
+  PARTITION çççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç VALUES LESS THAN (1000) ENGINE = InnoDB,
+  PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB);
+
+drop database mysqltest1;
diff --git a/mysql-test/suite/rpl/r/circular_serverid0.result b/mysql-test/suite/rpl/r/circular_serverid0.result
new file mode 100644
index 00000000000..112f9359ac4
--- /dev/null
+++ b/mysql-test/suite/rpl/r/circular_serverid0.result
@@ -0,0 +1,42 @@
+include/rpl_init.inc [topology=1->2->1]
+include/rpl_connect.inc [creating M4]
+include/rpl_connect.inc [creating M2]
+SET @old_debug= @@global.debug;
+connection M2;
+STOP SLAVE;
+SET GLOBAL debug_dbug= "+d,dbug.rows_events_to_delay_relay_logging";
+START SLAVE IO_THREAD;
+include/wait_for_slave_io_to_start.inc
+connection M2;
+CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(30000)) ENGINE=innodb;
+connection M4;
+connection M4;
+INSERT INTO `t1` VALUES (null, repeat('a', 1024)), (null, repeat('b', 1024));
+connection M2;
+SET debug_sync='now WAIT_FOR start_sql_thread';
+START SLAVE SQL_THREAD;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Gtid	#	#	GTID #-#-#
+slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(30000)) ENGINE=innodb
+SET debug_sync='now SIGNAL go_on_relay_logging';
+connection M4;
+connection M4;
+connection M2;
+connection M2;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Gtid	#	#	GTID #-#-#
+slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(30000)) ENGINE=innodb
+slave-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+slave-bin.000001	#	Annotate_rows	#	#	INSERT INTO `t1` VALUES (null, repeat('a', 1024)), (null, repeat('b', 1024))
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows_v1	#	#	table_id: #
+slave-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Xid	#	#	COMMIT /* XID */
+connection M4;
+drop table t1;
+connection M2;
+SET GLOBAL debug_dbug= @old_debug;
+SET debug_sync='RESET';
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/circular_serverid0.cnf b/mysql-test/suite/rpl/t/circular_serverid0.cnf
new file mode 100644
index 00000000000..277aac2869b
--- /dev/null
+++ b/mysql-test/suite/rpl/t/circular_serverid0.cnf
@@ -0,0 +1,30 @@
+!include ../my.cnf
+
+[mysqld.1]
+gtid-domain-id=4
+server-id=4
+#
+log-slave-updates
+slave-parallel-threads=0
+gtid-strict-mode=1
+gtid-ignore-duplicates=1
+
+#
+# Max-size row events to minimum with the idea to create
+# a number of Rows_log_event per Query.
+#
+binlog-row-event-max-size=1024
+
+[mysqld.2]
+gtid-domain-id=2
+server-id=2
+#
+log-slave-updates
+slave-parallel-threads=0
+gtid-strict-mode=1
+gtid-ignore-duplicates=1
+binlog-row-event-max-size=1024
+# The slave will be initialized with a @@global.dbug-var value
+skip-slave-start=1
+
+
diff --git a/mysql-test/suite/rpl/t/circular_serverid0.test b/mysql-test/suite/rpl/t/circular_serverid0.test
new file mode 100644
index 00000000000..20ad58e2c52
--- /dev/null
+++ b/mysql-test/suite/rpl/t/circular_serverid0.test
@@ -0,0 +1,104 @@
+#
+# Testing chain/circular replication scenario of MDEV-9670
+# The effect of the bug was that we got a commit with a GTID with server_id
+#
+
+--source include/have_binlog_format_row.inc
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+
+--let $rpl_topology= 1->2->1
+--source include/rpl_init.inc
+
+--let $rpl_connection_name= M4
+--let $rpl_server_number= 1
+--source include/rpl_connect.inc
+
+--let $rpl_connection_name= M2
+--let $rpl_server_number= 2
+--source include/rpl_connect.inc
+
+# The parameter reflects binlog-row-event-max-size @cnf.
+--let $row_size=1024
+
+SET @old_debug= @@global.debug;
+
+--connection M2
+STOP SLAVE;
+SET GLOBAL debug_dbug= "+d,dbug.rows_events_to_delay_relay_logging";
+START SLAVE IO_THREAD;
+--source include/wait_for_slave_io_to_start.inc
+
+--connection M2
+# This query also creates a Gtid event group whose Gtid will remain in
+# ignored status for too long causing a following group split.
+
+CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(30000)) ENGINE=innodb;
+--sync_slave_with_master M4
+
+# This INSERT will be logged as two Write_log events which the buggy
+# slave applier would split.
+
+--connection M4
+eval INSERT INTO `t1` VALUES (null, repeat('a', $row_size)), (null, repeat('b', $row_size));
+
+# START M2 IO thread and wait for its signal to follow with the SQL
+# thread start.  At this moment the SQL thread shall be having 2 and
+# "half" groups to execute.  The "hafl" one would be committed by the
+# buggy applier after which the IO is released to queue the rest of
+# the 3rd group which the SQL thread commits separately to complete
+# the split.
+
+--connection M2
+
+# wait for IO signal to start the SQL thread. IO will be hanging upon that.
+SET debug_sync='now WAIT_FOR start_sql_thread';
+
+# Now the slave server has relay log whose last group is incomplete.
+# An unfixed slave server would go to "insert" a "fake"
+# Gtid_list_log_event event which actually would commit the incomplete
+# group. However before to actual commit do_apply_event() hits some assert.
+# In the fixed server the fake Gtid_list_log_event is *not* inserted
+# in the middle of a group.
+START SLAVE SQL_THREAD;
+
+# Sleep for a little time to give SQL thread a chance to commit while
+# the IO thread is hanging (see
+# DBUG_EXECUTE_IF("dbug.rows_events_to_delay_relay_logging"...) in
+# queue_event).  Alternatively to reproduce the case when buggy slave
+# wait for the 1st group commit
+
+#--let $count= 1
+#--let $table= t1
+#--source include/wait_until_rows_count.inc
+
+--sleep 2
+
+# Demonstrate either no split group in the correct slave or the 1nd
+# group in the buggy one
+--source include/show_binlog_events.inc
+
+# Release the IO thread
+SET debug_sync='now SIGNAL go_on_relay_logging';
+
+# Sync servers
+--sync_slave_with_master M4
+--connection M4
+--sync_slave_with_master M2
+--connection M2
+
+# Demonstrate replication goes correctly not to create any split, or
+# the 2nd group in the buggy slave
+--source include/show_binlog_events.inc
+
+#
+# Cleanup
+#
+--connection M4
+drop table t1;
+
+--connection M2
+SET GLOBAL debug_dbug= @old_debug;
+SET debug_sync='RESET';
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/storage_engine/parts/truncate_table.result b/mysql-test/suite/storage_engine/parts/truncate_table.result
index fc409b805e2..bfbca529200 100644
--- a/mysql-test/suite/storage_engine/parts/truncate_table.result
+++ b/mysql-test/suite/storage_engine/parts/truncate_table.result
@@ -14,7 +14,7 @@ t1	CREATE TABLE `t1` (
   `c` char(8) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
+ PARTITION BY HASH (`a`)
 PARTITIONS 2
 INSERT INTO t1 (c) VALUES ('a'),('b'),('c');
 SHOW CREATE TABLE t1;
@@ -24,7 +24,7 @@ t1	CREATE TABLE `t1` (
   `c` char(8) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=<STORAGE_ENGINE> AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
+ PARTITION BY HASH (`a`)
 PARTITIONS 2
 TRUNCATE TABLE t1;
 SHOW CREATE TABLE t1;
@@ -34,7 +34,7 @@ t1	CREATE TABLE `t1` (
   `c` char(8) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
+ PARTITION BY HASH (`a`)
 PARTITIONS 2
 INSERT INTO t1 (c) VALUES ('d');
 SHOW CREATE TABLE t1;
@@ -44,7 +44,7 @@ t1	CREATE TABLE `t1` (
   `c` char(8) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=<STORAGE_ENGINE> AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
- PARTITION BY HASH (a)
+ PARTITION BY HASH (`a`)
 PARTITIONS 2
 SELECT a,c FROM t1;
 a	c
diff --git a/mysql-test/t/analyze_format_json.test b/mysql-test/t/analyze_format_json.test
index 88a907718d9..915e0c2bf3c 100644
--- a/mysql-test/t/analyze_format_json.test
+++ b/mysql-test/t/analyze_format_json.test
@@ -212,3 +212,15 @@ GROUP BY sq ORDER BY gc;
 
 drop table t1,t2,t3;
 
+
+--echo #
+--echo # MDEV-13286: Floating point exception in Filesort_tracker::print_json_members(Json_writer*)
+--echo #
+create table t0(a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t1 (a int, b int, c int);
+insert into t1 select a,a,a from t0;
+create table t2 as select * from t1;
+--source include/analyze-format.inc
+analyze format=json select a, (select t2.b from t2 where t2.a<t1.a order by t2.c limit 1) from t1 where t1.a<0;
+drop table t0,t1,t2;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 59694635c70..4d4a3f2d933 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -3606,7 +3606,7 @@ SET SESSION sql_mode=@old_sql_mode;
 drop table t2, t1;
 drop view v1;
 
---echo End of 5.0 tests.
+--echo # End of 5.0 tests.
 
 #
 # Test [NOT] IN truth table (both as top-level and general predicate).
@@ -4691,7 +4691,7 @@ select * from t2 where a=(select a from t1) and a='x';
 
 drop table t1,t2;
 
---echo End of 5.1 tests
+--echo # End of 5.1 tests
 
 --echo #
 --echo # Bug #11765713 58705:
@@ -5163,7 +5163,7 @@ eval SELECT * FROM ( $subq ) AS alias3;
 
 DROP TABLE t1,t2;
 
---echo End of 5.2 tests
+--echo # End of 5.2 tests
 
 --echo #
 --echo # BUG#779885: Crash in eliminate_item_equal with materialization=on in
@@ -6012,11 +6012,17 @@ INSERT INTO t2 VALUES (3);
 
 CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2;
 
+--error ER_WRONG_GROUP_FIELD
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+--error ER_WRONG_GROUP_FIELD
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
 SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0;
 SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 );
 
 delete from t1;
+--error ER_WRONG_GROUP_FIELD
+SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq;
+--error ER_WRONG_GROUP_FIELD
 SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq;
 
 drop view v2;
@@ -6032,6 +6038,32 @@ SELECT * FROM t1 WHERE f2 >= SOME ( SELECT f1 FROM t1 );
 SELECT * FROM t1 WHERE f2 <= SOME ( SELECT f1 FROM t1 );
 DROP TABLE t1;
 
+--echo #
+--echo # MDEV-10146: Wrong result (or questionable result and behavior)
+--echo # with aggregate function in uncorrelated SELECT subquery
+--echo #
+CREATE TABLE t1 (f1 INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES (1),(2);
+
+CREATE TABLE t2 (f2 int);
+
+INSERT INTO t2 VALUES (3);
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+
+INSERT INTO t2 VALUES (4);
+
+--error ER_SUBQUERY_NO_1_ROW
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1;
+--error ER_SUBQUERY_NO_1_ROW
+SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
+
+drop view v1;
+drop table t1,t2;
+
+--echo # End of 10.0 tests
 
 --echo #
 --echo # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops
@@ -6059,7 +6091,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
 DROP TABLE t1, t2;
 SET NAMES default;
 
---echo End of 10.1 tests
+--echo # End of 10.1 tests
 
 --echo #
 --echo # MDEV-12564: IN TO EXISTS transformation for rows after 
@@ -6076,4 +6108,4 @@ SELECT * FROM t t1 RIGHT JOIN t t2 ON (t2.pk = t1.pk)
 
 DROP TABLE t;
 
---echo End of 10.2 tests
+--echo # End of 10.2 tests
diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests
index 48ca6184c50..08a42d543e2 100644
--- a/mysql-test/unstable-tests
+++ b/mysql-test/unstable-tests
@@ -24,38 +24,57 @@
 ##############################################################################
 
 
+main.alter_table_online            : Modified in 10.2.7
 main.analyze_format_json           : MDEV-11866 - Mismatch
+main.analyze_stmt_slow_query_log   : MDEV-12237 - Wrong result
 main.analyze_stmt_orderby          : MDEV-11866 - Mismatch
+main.bootstrap                     : Modified in 10.2.7
 main.check_constraint              : Modified in 10.2.6
-main.cte_nonrecursive              : Modified in 10.2.6
+main.client_xml                    : Modified in 10.2.7
+main.cte_nonrecursive              : Modified in 10.2.7
 main.cte_recursive                 : Modified in 10.2.6
-main.default                       : MDEV-12738 - Valgrind; modified in 10.2.6
-main.derived_cond_pushdown         : Modified in 10.2.6
+main.ctype_ucs                     : Modified in 10.2.7
+main.default                       : Modified in 10.2.6
+main.derived_cond_pushdown         : Modified in 10.2.7
+main.derived_view                  : Modified in 10.2.7
 main.drop-no_root                  : MDEV-12633 - Valgrind
-main.events_2                      : Modified in 10.2.6
+main.errors                        : Modified in 10.2.7
+main.events_2                      : MDEV-13277 - Crash; modified in 10.2.6
+main.func_concat                   : Modified in 10.2.7
+main.func_crypt                    : Modified in 10.2.7
+main.func_group                    : Modified in 10.2.7
 main.func_json                     : MDEV-11648 - Valgrind; modified in 10.2.6
-main.gis                           : Modified in 10.2.6
+main.func_regexp_pcre              : Modified in 10.2.7
+main.gis                           : Modified in 10.2.7
 main.index_merge_innodb            : MDEV-7142 - Plan mismatch
+main.innodb_ext_key                : Modified in 10.2.7
+main.innodb_mysql_lock             : MDEV-7861 - Wrong result
 main.join_cache                    : Modified in 10.2.6
+main.join_outer                    : Modified in 10.2.7
 main.keyread                       : Added in 10.2.6
+main.kill-2                        : MDEV-13257 - Wrong result
 main.limit_rows_examined           : Modified in 10.2.6
 main.loaddata                      : Modified in 10.2.6
 main.loadxml                       : Modified in 10.2.6
-main.log_tables-big                : MDEV-12764	- Mismatch; modified in 10.2.6
-main.mix2_myisam                   : MDEV-11646 - Valgrind
-main.mrr_icp_extra                 : MDEV-11646 - Valgrind
-main.myisam                        : MDEV-11646 - Valgrind
-main.myisampack                    : MDEV-11646 - Valgrind
+main.log_slow                      : MDEV-13263 - Wrong result
+main.log_tables-big                : Modified in 10.2.6
+main.mdl                           : Added in 10.2.7
+main.mdl_sync                      : Modified in 10.2.7
+main.myisam_debug                  : Modified in 10.2.7
+main.mysql                         : Modified in 10.2.7
 main.mysql_client_test             : MDEV-12633 - Valgrind
 main.mysql_client_test_comp        : MDEV-12633 - Valgrind
 main.mysql_client_test_nonblock    : MDEV-12633 - Valgrind, CONC-208 - Error on Power
 main.mysqlcheck                    : MDEV-12633 - Valgrind
+main.mysqld--help                  : Modified in 10.2.7
 main.mysqld_option_err             : MDEV-12747 - Timeout
-main.mysqldump                     : Modified in 10.2.6
+main.mysqldump                     : MDEV-13191 - Assertion; modified in 10.2.6
 main.mysqlhotcopy_myisam           : MDEV-10995 - Hang on debug
-main.mysqltest                     : Modified in 10.2.6
+main.mysqltest                     : Modified in 10.2.7
 main.openssl_1                     : Modified in 10.2.6
 main.openssl_6975                  : Modified in 10.2.6
+main.order_by                      : Modified in 10.2.7
+main.partition_alter               : Modified in 10.2.7
 main.partition_default             : Modified in 10.2.6
 main.plugin_loaderr                : Modified in 10.2.6
 main.query_cache_innodb            : Added in 10.2.6
@@ -66,15 +85,22 @@ main.ssl_7937                      : MDEV-11546 - Timeout on Windows; combinatio
 main.ssl_8k_key                    : Modified in 10.2.6
 main.ssl_ca                        : MDEV-10895 - SSL connection error on Power
 main.ssl_timeout                   : MDEV-11244 - Crash
-main.stat_tables_par               : MDEV-10804 - Locking, mismatch
-main.subselect                     : Modified in 10.2.6
+main.stat_tables_par               : MDEV-13266 - Wrong result
+main.status                        : MDEV-13255 - Wrong result
+main.subselect                     : Modified in 10.2.7
 main.subselect_exists2in           : Modified in 10.2.6
-main.subselect_innodb              : Modified in 10.2.6
-main.subselect_mat_cost_bugs       : Modified in 10.2.6
-main.subselect_sj_mat              : Modified in 10.2.6
+main.subselect_innodb              : Modified in 10.2.7
+main.subselect_mat_cost_bugs       : Modified in 10.2.7
+main.subselect_sj                  : Modified in 10.2.7
+main.subselect_sj_mat              : Modified in 10.2.7
+main.subselect_sj2_mat             : Modified in 10.2.7
 main.symlink                       : Modified in 10.2.6
-main.view                          : Modified in 10.2.6
-main.win                           : Modified in 10.2.6
+main.trigger                       : Modified in 10.2.7
+main.type_json                     : Added in 10.2.7
+main.union                         : Modified in 10.2.7
+main.view                          : Modified in 10.2.7
+main.win                           : Modified in 10.2.7
+main.win_insert_select             : Added in 10.2.7
 
 #----------------------------------------------------------------
 
@@ -83,21 +109,30 @@ archive.mysqlhotcopy_archive       : MDEV-10995 - Hang on debug
 #----------------------------------------------------------------
 
 binlog.binlog_commit_wait          : MDEV-10150 - Mismatch
+binlog.binlog_parallel_replication_marks_row     : Added in 10.2.7
+binlog.binlog_parallel_replication_marks_stm_mix : Added in 10.2.7
 binlog.binlog_unsafe               : MDEV-12436 - Data too long for column
+binlog.flashback                   : MDEV-13264 - Wrong result; modified in 10.2.7
+binlog.mysqladmin                  : Added in 10.2.7
 
 #----------------------------------------------------------------
 
+binlog_encryption.binlog_xa_recover : MDEV-12908 - Extra checkpoint
 binlog_encryption.rpl_binlog_errors : MDEV-12742 - Crash
 binlog_encryption.rpl_parallel      : MDEV-10653 - Timeout in include
 binlog_encryption.rpl_semi_sync     : MDEV-11673 - Valgrind
-binlog.flashback                    : Modified in 10.2.6
+binlog_encryption.rpl_stm_relay_ign_space : MDEV-13278 - Wrong result (test assertion)
 
 #----------------------------------------------------------------
 
+connect.jdbc_new                   : Modified in 10.2.7
 connect.secure_file_priv           : Modified in 10.2.6
 connect.tbl                        : MDEV-10179 - Mismatch, MDEV-9844 - Valgrind, crash
 connect.vcol                       : MDEV-12374 - Fails on Windows
-connect.zip                        : MDEV-12631 - Valgrind
+
+#----------------------------------------------------------------
+
+csv.read_only                      : Added in 10.2.7
 
 #----------------------------------------------------------------
 
@@ -117,30 +152,35 @@ encryption.innodb-bad-key-change3                : Modified in 10.2.6
 encryption.innodb-bad-key-change4                : Modified in 10.2.6
 encryption.innodb-bad-key-change5                : Modified in 10.2.6
 encryption.innodb-bad-key-shutdown               : Modified in 10.2.6
-encryption.innodb-compressed-blob                : Added in 10.2.6
+encryption.innodb-checksum-algorithm             : Added in 10.2.7
+encryption.innodb-compressed-blob                : Modified in 10.2.7
 encryption.innodb-discard-import                 : Modified in 10.2.6
 encryption.innodb-discard-import-change          : MDEV-12632 - Valgrind; modified in 10.2.6
 encryption.innodb-encryption-alter               : Modified in 10.2.6
 encryption.innodb-encryption-disable             : Modified in 10.2.6
-encryption.innodb_encryption_discard_import      : MDEV-11218 - Mismatch; modified in 10.2.6
+encryption.innodb_encryption_discard_import      : MDEV-12903 - Wrong result; modified in 10.2.6
 encryption.innodb_encryption_filekeys            : MDEV-9962 - Timeout; modified in 10.2.6
 encryption.innodb_encryption_is                  : Modified in 10.2.6
-encryption.innodb_encryption-page-compression    : Modified in 10.2.6
+encryption.innodb_encrypt_log                    : MDEV-13253 - Wrong result
+encryption.innodb_encrypt_log_corruption         : MDEV-13253 - Wrong result
+encryption.innodb_encryption-page-compression    : Re-enabled in 10.2.7
 encryption.innodb_encryption_row_compressed      : Modified in 10.2.6
 encryption.innodb_encryption_tables              : MDEV-9359 - Assertion failure; modified in 10.2.6
 encryption.innodb_first_page                     : Modified in 10.2.6
+encryption.innodb-first-page-read                : Added in 10.2.7
 encryption.innodb-force-corrupt                  : Added in 10.2.6
+encryption.innodb-key-rotation-disable           : Modified in 10.2.7
 encryption.innodb-log-encrypt                    : Added in 10.2.6
 encryption.innodb-log-encrypt-crash              : Added in 10.2.6
 encryption.innodb_lotoftables                    : Modified in 10.2.6
 encryption.innodb-missing-key                    : Modified in 10.2.6
-encryption.innodb_onlinealter_encryption         : MDEV-10099 - Mismatch; modified in 10.2.6
+encryption.innodb_onlinealter_encryption         : Modified in 10.2.6
 encryption.innodb-page_encryption                : Modified in 10.2.6
 encryption.innodb-page_encryption-32k            : Modified in 10.2.6
 encryption.innodb-page_encryption_compression    : Modified in 10.2.6
 encryption.innodb_page_encryption_key_change     : Modified in 10.2.6
 encryption.innodb-page_encryption_log_encryption : Modified in 10.2.6
-encryption.innodb-redo-badkey                    : MDEV-12750 - InnoDB error, crash; added in 10.2.6
+encryption.innodb-redo-badkey                    : Added in 10.2.6
 encryption.innodb-redo-nokeys                    : Added in 10.2.6
 encryption.innodb_scrub                          : Modified in 10.2.6
 encryption.innodb_scrub_background               : Uses opt file modified in 10.2.6
@@ -152,6 +192,7 @@ engines/rr_trx.*                   : MDEV-10998 - Not maintained
 
 #----------------------------------------------------------------
 
+federated.assisted_discovery       : Modified in 10.2.7
 federated.federated_innodb         : MDEV-10617 - Wrong checksum
 federated.federated_transactions   : MDEV-10617 - Wrong checksum
 federated.federatedx               : MDEV-10617 - Wrong checksum
@@ -169,6 +210,7 @@ galera.GAL-480                              : Added in 10.2.6
 galera.galera_account_management            : Modified in 10.2.6
 galera.galera_admin                         : Added in 10.2.6
 galera.galera_bf_abort                      : Modified in 10.2.6
+galera.galera_defaults                      : Modified in 10.2.7
 galera.galera_desync_overlapped             : Added in 10.2.6
 galera.galera_gcache_recover                : Added in 10.2.6
 galera.galera_gcache_recover_full_gcache    : Added in 10.2.6
@@ -192,6 +234,7 @@ galera.lp1376747-2                          : Added in 10.2.6
 galera.lp1376747-3                          : Added in 10.2.6
 galera.lp1376747-4                          : Added in 10.2.6
 galera.MW-258                               : Modified in 10.2.6
+galera.MW-309                               : Added in 10.2.7
 galera.MW-313                               : Added in 10.2.6
 galera.MW-328A                              : Added in 10.2.6
 galera.MW-328B                              : Added in 10.2.6
@@ -199,57 +242,76 @@ galera.MW-328C                              : Added in 10.2.6
 galera.MW-328D                              : Added in 10.2.6
 galera.MW-328E                              : Added in 10.2.6
 galera.MW-329                               : Added in 10.2.6
+galera.MW-369                               : Added in 10.2.7
 galera.pxc-421                              : Added in 10.2.6
 
-galera_3nodes.*                             : MDEV-11490 - Warnings not suppressed
-
 galera_3nodes.galera_safe_to_bootstrap      : Added in 10.2.6
 
 #----------------------------------------------------------------
 
 gcol.gcol_column_def_options_innodb : Uses include modified in 10.2.6
-gcol.gcol_column_def_options_myisam : MDEV-11647 - Valgrind; uses include modified in 10.2.6
-gcol.innodb_virtual_basic           : MDEV-11639 - Crash
+gcol.gcol_column_def_options_myisam : Uses include modified in 10.2.6
 gcol.innodb_virtual_debug           : Modified in 10.2.6
 gcol.innodb_virtual_fk              : Modified in 10.2.6
 
 #----------------------------------------------------------------
 
+innodb.101_compatibility             : Perl file modified in 10.2.7
+innodb.alter_missing_tablespace      : Modified in 10.2.7
 innodb.alter_table                   : Modified in 10.2.6
 innodb.autoinc_debug                 : Modified in 10.2.6
 innodb.autoinc_persist               : Modified in 10.2.6
-innodb.deadlock_detect               : Modified in 10.2.6
+innodb.deadlock_detect               : MDEV-13262 - Wrong error code; modified in 10.2.6
 innodb.defrag_mdl-9155               : MDEV-11336	- Timeout
+innodb.doublewrite                   : Modified in 10.2.7
+innodb.drop_table_background         : Added in 10.2.7
 innodb.foreign_key                   : Added in 10.2.6
+innodb.group_commit_binlog_pos       : Modified in 10.2.7
+innodb.group_commit_binlog_pos_no_optimize_thread : Modified in 10.2.7
 innodb.ibuf_not_empty                : MDEV-12741 - Tablespace error; added in 10.2.6
 innodb.innodb-32k-crash              : Modified in 10.2.6
 innodb.innodb-64k-crash              : Modified in 10.2.6
-innodb.innodb-alter-debug            : Added in 10.2.6
-innodb.innodb-alter-nullable         : Added in 10.2.6
-innodb.innodb-alter-timestamp        : Modified in 10.2.6
+innodb.innodb-alter-debug            : Modified in 10.2.7
+innodb.innodb-alter-nullable         : Modified in 10.2.7
+innodb.innodb-alter-table            : Modified in 10.2.7
+innodb.innodb-alter-tempfile         : Modified in 10.2.7
+innodb.innodb-alter-timestamp        : Modified in 10.2.7
 innodb.innodb-blob                   : Modified in 10.2.6
 innodb.innodb_bug14147491            : MDEV-11808 - Index is corrupt; modified in 10.2.6
-innodb.innodb_defragment             : MDEV-11336	- Mismatch; modified in 10.2.6
-innodb.innodb_defragment_small       : MDEV-11336	- Mismatch; modified in 10.2.6
-innodb.innodb_defrag_binlog          : MDEV-11336	- Mismatch
+innodb.innodb_bug53290               : MDEV-12634 - Valgrind
+innodb.innodb_defragment             : MDEV-11336 - Mismatch; modified in 10.2.6
+innodb.innodb_defragment_small       : MDEV-11336 - Mismatch; modified in 10.2.6
+innodb.innodb_defrag_binlog          : MDEV-11336 - Mismatch
 innodb.innodb_defrag_concurrent      : MDEV-11336 - Assertion failure, mismatch
-innodb.innodb_defrag_stats           : MDEV-11336	- Mismatch
-innodb.innodb_force_recovery         : Added in 10.2.6
+innodb.innodb_defrag_stats           : MDEV-11336 - Mismatch
+innodb.innodb_force_recovery         : Modified in 10.2.7
+innodb.innodb-get-fk                 : MDEV-13276 - Server crash
 innodb.innodb_gis                    : Modified in 10.2.6
 innodb.innodb-index-online-norebuild : Added in 10.2.6
 innodb.innodb-isolation              : Added in 10.2.6
-innodb.innodb_stats_del_mark         : Added in 10.2.6
+innodb.innodb-page_compression_default : Modified in 10.2.7
+innodb.innodb-page_compression_snappy  : Modified in 10.2.7
+innodb.innodb_stats_persistent         : Added in 10.2.7
 innodb.innodb_sys_semaphore_waits    : MDEV-10331 - Semaphore wait
 innodb.innodb-virtual-columns2       : Added in 10.2.6
 innodb.innodb-wl5522-debug           : Modified in 10.2.6
 innodb.insert_debug                  : Modified in 10.2.6
-innodb.log_file_name                 : Modified in 10.2.6
+innodb.log_corruption                : MDEV-13251 - Wrong result
+innodb.log_data_file_size            : Modified in 10.2.7
+innodb.log_file                      : Modified in 10.2.7
+innodb.log_file_name                 : Modified in 10.2.7
+innodb.log_file_size                 : Modified in 10.2.7
 innodb.readahead                     : Added in 10.2.6
 innodb.redo_log_during_checkpoint    : Added in 10.2.6
-innodb.truncate_debug                : MDEV-12753 - Sync point timeout, MDEV-12754 - Semaphore wait; added in 10.2.6
-innodb.truncate_purge_debug          : MDEV-12708	- Extra warning; added in 10.2.6
+innodb.row_format_redundant          : Added in 10.2.7
+innodb.table_flags                   : Added in 10.2.7
+innodb.temporary_table               : MDEV-13265 - Wrong result; modified in 10.2.7
+innodb.truncate_debug                : MDEV-13256 - Timeout; added in 10.2.6
+innodb.truncate_purge_debug          : Modified in 10.2.7
 
-innodb_fts.innodb_fts_plugin         : MDEV-11649 - Valgrind
+innodb_fts.fulltext_misc             : MDEV-12636 - Valgrind
+innodb_fts.innodb_fts_plugin         : Modified in 10.2.7
+innodb_fts.innodb_fts_stopword_charset : MDEV-13259 - Table crashed
 
 innodb_gis.rtree                     : Modified in 10.2.6
 
@@ -257,9 +319,24 @@ innodb_undo.truncate                 : Added in 10.2.6
 innodb_undo.truncate_multi_client    : Added in 10.2.6
 innodb_undo.truncate_recover         : Added in 10.2.6
 
-innodb_zip.recover                   : MDEV-12794 - Table crashed; added in 10.2.6
-innodb_zip.wl6501_1                  : MDEV-10891 - Can't create UNIX socket, MDEV-12748 - Unknown engine InnoDB
-innodb_zip.wl5522_debug_zip          : MDEV-11600 - Operating system error number 2
+innodb_zip.bug36169                  : Modified in 10.2.7
+innodb_zip.bug36172                  : Modified in 10.2.7
+innodb_zip.bug52745                  : Modified in 10.2.7
+innodb_zip.bug53591                  : Modified in 10.2.7
+innodb_zip.bug56680                  : Modified in 10.2.7
+innodb_zip.cmp_drop_table            : Modified in 10.2.7
+innodb_zip.create_options            : Modified in 10.2.7
+innodb_zip.innochecksum              : Modified in 10.2.7
+innodb_zip.innochecksum_2            : Modified in 10.2.7
+innodb_zip.innochecksum_3            : MDEV-13279 - Extra warnings; modified in 10.2.7
+innodb_zip.innodb-zip                : Modified in 10.2.7
+innodb_zip.recover                   : Modified in 10.2.7
+innodb_zip.restart                   : Modified in 10.2.7
+innodb_zip.wl6501_1                  : MDEV-10891 - Can't create UNIX socket
+innodb_zip.wl5522_debug_zip          : MDEV-11600 - Operating system error number 2; modified in 10.2.7
+innodb_zip.wl5522_zip                : Modified in 10.2.7
+innodb_zip.wl6344_compress_level     : Modified in 10.2.7
+innodb_zip.wl6501_scale_1            : MDEV-13254 - Timeout
 
 #----------------------------------------------------------------
 
@@ -267,16 +344,23 @@ json.json_no_table                 : MDEV-12732 - Valgrind
 
 #----------------------------------------------------------------
 
-large_tests.rpl_slave_net_timeout  : MDEV-11002 - Mismatch
-
-#----------------------------------------------------------------
-
 maria.insert_select                : MDEV-12757 - Timeout
-maria.maria                        : MDEV-11646 - Valgrind
 
 #----------------------------------------------------------------
 
-mariabackup.*                      : MariaDB backup is not yet supported for 10.2
+mariabackup.*                       : suite.pm and .opt modified in 10.2.7
+
+mariabackup.full_backup             : Modified in 10.2.7
+mariabackup.incremental_backup      : Modified in 10.2.7
+mariabackup.incremental_encrypted   : Modified in 10.2.7
+mariabackup.partial                 : Modified in 10.2.7
+mariabackup.partial_exclude         : Modified in 10.2.7
+mariabackup.small_ibd               : Modified in 10.2.7
+mariabackup.xb_aws_key_management   : Modified in 10.2.7
+mariabackup.xb_compressed_encrypted : Modified in 10.2.7
+mariabackup.xb_file_key_management  : Modified in 10.2.7
+mariabackup.xb_partition            : Modified in 10.2.7
+mariabackup.xbstream                : Modified in 10.2.7
 
 #----------------------------------------------------------------
 
@@ -285,17 +369,31 @@ mroonga/storage.index_multiple_column_unique_datetime_index_read : MDEV-8643 - V
 #----------------------------------------------------------------
 
 multi_source.info_logs             : MDEV-12629 - Valgrind
+multi_source.mdev-9544             : Added in 10.2.7
+multi_source.reset_slave           : MDEV-10690 - Wrong result
+multi_source.simple                : MDEV-4633 - Wrong result
 
 #----------------------------------------------------------------
 
+parts.longname                     : Added in 10.2.7
 parts.partition_debug_innodb       : MDEV-10891 - Can't create UNIX socket
+parts.quoting                      : Added in 10.2.7
+
+#----------------------------------------------------------------
+
+percona.*                                  : MDEV-10997 - Not maintained
 
 #----------------------------------------------------------------
 
+perfschema.bad_option_2                        : Modified in 10.2.7
 perfschema.bad_option_3                        : MDEV-12728 - Timeout on Power
 perfschema.hostcache_ipv4_addrinfo_again_allow : MDEV-12759 - Crash
 perfschema.hostcache_ipv6_addrinfo_again_allow : MDEV-12752 - Crash
+perfschema.hostcache_ipv6_addrinfo_bad_allow   : MDEV-13260 - Crash
+perfschema.hostcache_ipv6_ssl                  : MDEV-10696 - Crash
+perfschema.setup_actors                        : MDEV-10679 - Crash
 perfschema.stage_mdl_procedure                 : MDEV-11545 - Missing row
+perfschema.start_server_1_digest               : Added in 10.2.7
 
 #----------------------------------------------------------------
 
@@ -303,10 +401,7 @@ perfschema_stress.*                : MDEV-10996 - Not maintained
 
 #----------------------------------------------------------------
 
-plugins.cracklib_password_check    : MDEV-11650 - Valgrind
 plugins.feedback_plugin_send       : MDEV-7932, MDEV-11118 - Connection problems and such
-plugins.pam                        : MDEV-10940 - Valgrind
-plugins.two_password_validations   : MDEV-11650 - Valgrind
 
 #----------------------------------------------------------------
 
@@ -314,20 +409,33 @@ rocksdb.*                           : MyRocks is alpha-quality and tests are uns
 
 #----------------------------------------------------------------
 
+roles.current_role_view-12666        : Added in 10.2.7
+roles.show_create_database-10463     : Added in 10.2.7
+
+#----------------------------------------------------------------
+
+rpl.circular_serverid0               : Added in 10.2.7
 rpl.rpl_binlog_errors                : MDEV-12742 - Crash
 rpl.rpl_binlog_index                 : MDEV-9501 - Failed registering on master
-rpl.rpl_domain_id_filter             : MDEV-12250 - Failed to preallocate data
 rpl.rpl_domain_id_filter_io_crash    : MDEV-12729 - Timeout in include file
+rpl.rpl_domain_id_filter_restart     : MDEV-10684 - Wrong result
 rpl.rpl_gtid_crash                   : MDEV-9501 - Failed registering on master
+rpl.rpl_gtid_errorhandling           : MDEV-13261 - Crash
 rpl.rpl_gtid_stop_start              : MDEV-11621 - Table marked as crashed, MDEV-12731 - Valgrind
-rpl.rpl_killed_ddl                   : MDEV-12756 - Can't find record
 rpl.rpl_mariadb_slave_capability     : MDEV-11018 - Extra lines in binlog
+rpl.rpl_mdev-11092                   : MDEV-13065 - Wrong value in include; added in 10.2.7
 rpl.rpl_parallel                     : MDEV-12730 - Assertion failure
+rpl.rpl_parallel_mdev6589            : MDEV-12979 - Assertion failure
+rpl.rpl_parallel_optimistic          : Modified in 10.2.7
 rpl.rpl_parallel_optimistic_nobinlog : MDEV-12746 - Timeouts, mismatch
 rpl.rpl_parallel_retry               : MDEV-11119 - Crash
 rpl.rpl_temporal_mysql56_to_mariadb53 : MDEV-9501 - Failed registering on master
 rpl.rpl_semi_sync_uninstall_plugin   : MDEV-10892 - Assertion failure
+rpl.rpl_set_statement_default_master : MDEV-13258 - Extra warning
+rpl.rpl_skip_replication             : MDEV-13258 - Extra warning
 rpl.rpl_slave_grp_exec               : MDEV-10514 - Deadlock
+rpl.rpl_slow_query_log               : MDEV-13250 - Test abort
+rpl.rpl_sp_effects                   : MDEV-13249 - Crash
 rpl.rpl_stm_multi_query              : MDEV-9501 - Failed registering on master
 rpl.rpl_upgrade_master_info          : MDEV-11620 - Table marked as crashed
 
@@ -346,32 +454,61 @@ sphinx.union-5539                  : MDEV-10986 - Sporadic failures
 
 #----------------------------------------------------------------
 
+storage_engine.*                   : Not always timely maintained
+
+#----------------------------------------------------------------
+
+sys_vars.delay_key_write_func           : Modified in 10.2.7
 sys_vars.innodb_deadlock_detect_basic   : Added in 10.2.6
 sys_vars.innodb_max_undo_log_size_basic : Modified in 10.2.6
+sys_vars.innodb_sched_priority_cleaner_basic : Modified in 10.2.7
 sys_vars.innodb_support_xa_basic        : Modified in 10.2.6
 sys_vars.innodb_support_xa_func         : Modified in 10.2.6
 sys_vars.log_error_func                 : Modified in 10.2.6
 sys_vars.rpl_init_slave_func            : MDEV-10149 - Test assertion
 sys_vars.sysvars_wsrep                  : Modified in 10.2.6
+sys_vars.tmp_disk_table_size_basic      : Added in 10.2.7
+sys_vars.tmp_disk_table_size_func       : Added in 10.2.7
+sys_vars.tmp_memory_table_size_basic    : Added in 10.2.7
 
 #----------------------------------------------------------------
 
+tokudb.background_job_manager      : Modified in 10.2.7
+tokudb.bug-1657908                 : Added in 10.2.7
+tokudb.dir_cmd                     : Added in 10.2.7
+tokudb.hotindex-insert-bigchar     : MDEV-12640 - Crash
+tokudb.hotindex-update-1           : MDEV-12640 - Crash
+tokudb.rows-32m-rand-insert        : MDEV-12640 - Crash
+
 tokudb_mariadb.mdev6657            : MDEV-12737 - Mismatch or valgrind
 
-tokudb_backup.*                    : MDEV-11001 - Missing include file
+tokudb_backup.*                    : MDEV-11001 - Missing include file; suite.pm modified in 10.2.7
 tokudb_sys_vars.*                  : MDEV-11001 - Missing include file
 tokudb_rpl.*                       : MDEV-11001 - Missing include file
 
+tokudb_backup.backup_master_info            : Added in 10.2.7
+tokudb_backup.backup_master_state           : Added in 10.2.7
+tokudb_backup.empty_slave_info_file         : Added in 10.2.7
+tokudb_backup.innodb_use_native_aio_enabled : Added in 10.2.7
+tokudb_backup.rpl_safe_slave                : Added in 10.2.7
+tokudb_backup.rpl_tokudb_commit_sync        : Added in 10.2.7
+
+tokudb_bugs.db233                  : Modified in 10.2.7
+tokudb_bugs.leak172                : Modified in 10.2.7
+tokudb_bugs.xa-3                   : MDEV-13267 - Assertion failure
+tokudb_bugs.xa-4                   : MDEV-13267 - Assertion failure
+
+#----------------------------------------------------------------
+
+unit.conc_ps_bugs                  : MDEV-13252 - not ok 44 test_bug4236
+
 #----------------------------------------------------------------
 
-unit.conc_connection               : CONC-252 - Connector tests fail
-unit.conc_features-10_2            : CONC-252 - Connector tests fail
-unit.conc_misc                     : CONC-252 - Connector tests fail
-unit.conc_thread                   : CONC-252 - Connector tests fail
+vcol.cross_db                      : Added in 10.2.7
+vcol.upgrade                       : Added in 10.2.7
 
 #----------------------------------------------------------------
 
 wsrep.binlog_format                : Modified in 10.2.6
-wsrep_info.plugin                  : MDEV-12232 - Crash on Power
-wsrep.pool_of_threads              : MDEV-12234 - GLIBCXX_3.4.20 not found, MDEV-12758 - node not prepared
+wsrep.pool_of_threads              : MDEV-12234 - GLIBCXX_3.4.20 not found; modified in 10.2.7
 wsrep.wsrep_rpl                    : Modified in 10.2.6
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 0458ded53f9..dae6eb32afc 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -676,7 +676,7 @@ int ha_partition::create(const char *name, TABLE *table_arg,
 			 HA_CREATE_INFO *create_info)
 {
   int error;
-  char name_buff[FN_REFLEN], name_lc_buff[FN_REFLEN];
+  char name_buff[FN_REFLEN + 1], name_lc_buff[FN_REFLEN];
   char *name_buffer_ptr;
   const char *path;
   uint i;
@@ -718,8 +718,9 @@ int ha_partition::create(const char *name, TABLE *table_arg,
       for (j= 0; j < m_part_info->num_subparts; j++)
       {
         part_elem= sub_it++;
-        create_partition_name(name_buff, path, name_buffer_ptr,
-                              NORMAL_PART_NAME, FALSE);
+        if ((error= create_partition_name(name_buff, sizeof(name_buff), path,
+                                  name_buffer_ptr, NORMAL_PART_NAME, FALSE)))
+          goto create_error;
         if ((error= set_up_table_before_create(table_arg, name_buff,
                                                create_info, part_elem)) ||
             ((error= (*file)->ha_create(name_buff, table_arg, create_info))))
@@ -731,8 +732,9 @@ int ha_partition::create(const char *name, TABLE *table_arg,
     }
     else
     {
-      create_partition_name(name_buff, path, name_buffer_ptr,
-                            NORMAL_PART_NAME, FALSE);
+      if ((error= create_partition_name(name_buff, sizeof(name_buff), path,
+                                    name_buffer_ptr, NORMAL_PART_NAME, FALSE)))
+        goto create_error;
       if ((error= set_up_table_before_create(table_arg, name_buff,
                                              create_info, part_elem)) ||
           ((error= (*file)->ha_create(name_buff, table_arg, create_info))))
@@ -748,9 +750,9 @@ create_error:
   name_buffer_ptr= m_name_buffer_ptr;
   for (abort_file= file, file= m_file; file < abort_file; file++)
   {
-    create_partition_name(name_buff, path, name_buffer_ptr, NORMAL_PART_NAME,
-                          FALSE);
-    (void) (*file)->ha_delete_table((const char*) name_buff);
+    if (!create_partition_name(name_buff, sizeof(name_buff), path,
+                               name_buffer_ptr, NORMAL_PART_NAME, FALSE))
+      (void) (*file)->ha_delete_table((const char*) name_buff);
     name_buffer_ptr= strend(name_buffer_ptr) + 1;
   }
   handler::delete_table(name);
@@ -777,7 +779,7 @@ create_error:
 int ha_partition::drop_partitions(const char *path)
 {
   List_iterator<partition_element> part_it(m_part_info->partitions);
-  char part_name_buff[FN_REFLEN];
+  char part_name_buff[FN_REFLEN + 1];
   uint num_parts= m_part_info->partitions.elements;
   uint num_subparts= m_part_info->num_subparts;
   uint i= 0;
@@ -810,9 +812,11 @@ int ha_partition::drop_partitions(const char *path)
         {
           partition_element *sub_elem= sub_it++;
           part= i * num_subparts + j;
-          create_subpartition_name(part_name_buff, path,
-                                   part_elem->partition_name,
-                                   sub_elem->partition_name, name_variant);
+          if ((ret_error= create_subpartition_name(part_name_buff,
+                            sizeof(part_name_buff), path,
+                            part_elem->partition_name,
+                            sub_elem->partition_name, name_variant)))
+            error= ret_error;
           file= m_file[part];
           DBUG_PRINT("info", ("Drop subpartition %s", part_name_buff));
           if ((ret_error= file->ha_delete_table(part_name_buff)))
@@ -823,15 +827,19 @@ int ha_partition::drop_partitions(const char *path)
       }
       else
       {
-        create_partition_name(part_name_buff, path,
-                              part_elem->partition_name, name_variant,
-                              TRUE);
-        file= m_file[i];
-        DBUG_PRINT("info", ("Drop partition %s", part_name_buff));
-        if ((ret_error= file->ha_delete_table(part_name_buff)))
+        if ((ret_error= create_partition_name(part_name_buff,
+                          sizeof(part_name_buff), path,
+                          part_elem->partition_name, name_variant, TRUE)))
           error= ret_error;
-        if (deactivate_ddl_log_entry(part_elem->log_entry->entry_pos))
-          error= 1;
+        else
+        {
+          file= m_file[i];
+          DBUG_PRINT("info", ("Drop partition %s", part_name_buff));
+          if ((ret_error= file->ha_delete_table(part_name_buff)))
+            error= ret_error;
+          if (deactivate_ddl_log_entry(part_elem->log_entry->entry_pos))
+            error= 1;
+        }
       }
       if (part_elem->part_state == PART_IS_CHANGED)
         part_elem->part_state= PART_NORMAL;
@@ -867,8 +875,8 @@ int ha_partition::rename_partitions(const char *path)
 {
   List_iterator<partition_element> part_it(m_part_info->partitions);
   List_iterator<partition_element> temp_it(m_part_info->temp_partitions);
-  char part_name_buff[FN_REFLEN];
-  char norm_name_buff[FN_REFLEN];
+  char part_name_buff[FN_REFLEN + 1];
+  char norm_name_buff[FN_REFLEN + 1];
   uint num_parts= m_part_info->partitions.elements;
   uint part_count= 0;
   uint num_subparts= m_part_info->num_subparts;
@@ -910,10 +918,11 @@ int ha_partition::rename_partitions(const char *path)
         {
           sub_elem= sub_it++;
           file= m_reorged_file[part_count++];
-          create_subpartition_name(norm_name_buff, path,
-                                   part_elem->partition_name,
-                                   sub_elem->partition_name,
-                                   NORMAL_PART_NAME);
+          if ((ret_error= create_subpartition_name(norm_name_buff,
+                            sizeof(norm_name_buff), path,
+                            part_elem->partition_name,
+                            sub_elem->partition_name, NORMAL_PART_NAME)))
+            error= ret_error;
           DBUG_PRINT("info", ("Delete subpartition %s", norm_name_buff));
           if ((ret_error= file->ha_delete_table(norm_name_buff)))
             error= ret_error;
@@ -926,16 +935,20 @@ int ha_partition::rename_partitions(const char *path)
       else
       {
         file= m_reorged_file[part_count++];
-        create_partition_name(norm_name_buff, path,
-                              part_elem->partition_name, NORMAL_PART_NAME,
-                              TRUE);
-        DBUG_PRINT("info", ("Delete partition %s", norm_name_buff));
-        if ((ret_error= file->ha_delete_table(norm_name_buff)))
+        if ((ret_error= create_partition_name(norm_name_buff,
+                          sizeof(norm_name_buff), path,
+                          part_elem->partition_name, NORMAL_PART_NAME, TRUE)))
           error= ret_error;
-        else if (deactivate_ddl_log_entry(part_elem->log_entry->entry_pos))
-          error= 1;
         else
-          part_elem->log_entry= NULL; /* Indicate success */
+        {
+          DBUG_PRINT("info", ("Delete partition %s", norm_name_buff));
+          if ((ret_error= file->ha_delete_table(norm_name_buff)))
+            error= ret_error;
+          else if (deactivate_ddl_log_entry(part_elem->log_entry->entry_pos))
+            error= 1;
+          else
+            part_elem->log_entry= NULL; /* Indicate success */
+        }
       }
     } while (++i < temp_partitions);
     (void) sync_ddl_log();
@@ -978,10 +991,11 @@ int ha_partition::rename_partitions(const char *path)
         {
           sub_elem= sub_it++;
           part= i * num_subparts + j;
-          create_subpartition_name(norm_name_buff, path,
-                                   part_elem->partition_name,
-                                   sub_elem->partition_name,
-                                   NORMAL_PART_NAME);
+          if ((ret_error= create_subpartition_name(norm_name_buff,
+                            sizeof(norm_name_buff), path,
+                            part_elem->partition_name,
+                            sub_elem->partition_name, NORMAL_PART_NAME)))
+            error= ret_error;
           if (part_elem->part_state == PART_IS_CHANGED)
           {
             file= m_reorged_file[part_count++];
@@ -993,10 +1007,11 @@ int ha_partition::rename_partitions(const char *path)
             (void) sync_ddl_log();
           }
           file= m_new_file[part];
-          create_subpartition_name(part_name_buff, path,
-                                   part_elem->partition_name,
-                                   sub_elem->partition_name,
-                                   TEMP_PART_NAME);
+          if ((ret_error= create_subpartition_name(part_name_buff,
+                            sizeof(part_name_buff), path,
+                            part_elem->partition_name,
+                            sub_elem->partition_name, TEMP_PART_NAME)))
+            error= ret_error;
           DBUG_PRINT("info", ("Rename subpartition from %s to %s",
                      part_name_buff, norm_name_buff));
           if ((ret_error= file->ha_rename_table(part_name_buff,
@@ -1010,32 +1025,36 @@ int ha_partition::rename_partitions(const char *path)
       }
       else
       {
-        create_partition_name(norm_name_buff, path,
-                              part_elem->partition_name, NORMAL_PART_NAME,
-                              TRUE);
-        if (part_elem->part_state == PART_IS_CHANGED)
+        if ((ret_error= create_partition_name(norm_name_buff,
+                          sizeof(norm_name_buff), path,
+                          part_elem->partition_name, NORMAL_PART_NAME, TRUE)) ||
+            (ret_error= create_partition_name(part_name_buff,
+                          sizeof(part_name_buff), path,
+                          part_elem->partition_name, TEMP_PART_NAME, TRUE)))
+          error= ret_error;
+        else
         {
-          file= m_reorged_file[part_count++];
-          DBUG_PRINT("info", ("Delete partition %s", norm_name_buff));
-          if ((ret_error= file->ha_delete_table(norm_name_buff)))
+          if (part_elem->part_state == PART_IS_CHANGED)
+          {
+            file= m_reorged_file[part_count++];
+            DBUG_PRINT("info", ("Delete partition %s", norm_name_buff));
+            if ((ret_error= file->ha_delete_table(norm_name_buff)))
+              error= ret_error;
+            else if (deactivate_ddl_log_entry(part_elem->log_entry->entry_pos))
+              error= 1;
+            (void) sync_ddl_log();
+          }
+          file= m_new_file[i];
+          DBUG_PRINT("info", ("Rename partition from %s to %s",
+                     part_name_buff, norm_name_buff));
+          if ((ret_error= file->ha_rename_table(part_name_buff,
+                                                norm_name_buff)))
             error= ret_error;
           else if (deactivate_ddl_log_entry(part_elem->log_entry->entry_pos))
             error= 1;
-          (void) sync_ddl_log();
+          else
+            part_elem->log_entry= NULL;
         }
-        file= m_new_file[i];
-        create_partition_name(part_name_buff, path,
-                              part_elem->partition_name, TEMP_PART_NAME,
-                              TRUE);
-        DBUG_PRINT("info", ("Rename partition from %s to %s",
-                   part_name_buff, norm_name_buff));
-        if ((ret_error= file->ha_rename_table(part_name_buff,
-                                              norm_name_buff)))
-          error= ret_error;
-        else if (deactivate_ddl_log_entry(part_elem->log_entry->entry_pos))
-          error= 1;
-        else
-          part_elem->log_entry= NULL;
       }
     }
   } while (++i < num_parts);
@@ -1651,7 +1670,7 @@ int ha_partition::change_partitions(HA_CREATE_INFO *create_info,
 {
   List_iterator<partition_element> part_it(m_part_info->partitions);
   List_iterator <partition_element> t_it(m_part_info->temp_partitions);
-  char part_name_buff[FN_REFLEN];
+  char part_name_buff[FN_REFLEN + 1];
   uint num_parts= m_part_info->partitions.elements;
   uint num_subparts= m_part_info->num_subparts;
   uint i= 0;
@@ -1880,10 +1899,14 @@ int ha_partition::change_partitions(HA_CREATE_INFO *create_info,
         do
         {
           partition_element *sub_elem= sub_it++;
-          create_subpartition_name(part_name_buff, path,
-                                   part_elem->partition_name,
-                                   sub_elem->partition_name,
-                                   name_variant);
+          if ((error= create_subpartition_name(part_name_buff,
+                        sizeof(part_name_buff), path,
+                        part_elem->partition_name, sub_elem->partition_name,
+                        name_variant)))
+          {
+            cleanup_new_partition(part_count);
+            DBUG_RETURN(error);
+          }
           part= i * num_subparts + j;
           DBUG_PRINT("info", ("Add subpartition %s", part_name_buff));
           if ((error= prepare_new_partition(table, create_info,
@@ -1901,9 +1924,14 @@ int ha_partition::change_partitions(HA_CREATE_INFO *create_info,
       }
       else
       {
-        create_partition_name(part_name_buff, path,
-                              part_elem->partition_name, name_variant,
-                              TRUE);
+        if ((error= create_partition_name(part_name_buff,
+                      sizeof(part_name_buff), path, part_elem->partition_name,
+                      name_variant, TRUE)))
+        {
+          cleanup_new_partition(part_count);
+          DBUG_RETURN(error);
+        }
+        
         DBUG_PRINT("info", ("Add partition %s", part_name_buff));
         if ((error= prepare_new_partition(table, create_info,
                                           new_file_array[i],
@@ -2274,8 +2302,8 @@ uint ha_partition::del_ren_table(const char *from, const char *to)
 {
   int save_error= 0;
   int error;
-  char from_buff[FN_REFLEN], to_buff[FN_REFLEN], from_lc_buff[FN_REFLEN],
-       to_lc_buff[FN_REFLEN];
+  char from_buff[FN_REFLEN + 1], to_buff[FN_REFLEN + 1],
+       from_lc_buff[FN_REFLEN], to_lc_buff[FN_REFLEN];
   char *name_buffer_ptr;
   const char *from_path;
   const char *to_path= NULL;
@@ -2311,13 +2339,15 @@ uint ha_partition::del_ren_table(const char *from, const char *to)
   i= 0;
   do
   {
-    create_partition_name(from_buff, from_path, name_buffer_ptr,
-                          NORMAL_PART_NAME, FALSE);
+    if ((error= create_partition_name(from_buff, sizeof(from_buff), from_path,
+                              name_buffer_ptr, NORMAL_PART_NAME, FALSE)))
+      goto rename_error;
 
     if (to != NULL)
     {                                           // Rename branch
-      create_partition_name(to_buff, to_path, name_buffer_ptr,
-                            NORMAL_PART_NAME, FALSE);
+      if ((error= create_partition_name(to_buff, sizeof(to_buff), to_path,
+                                name_buffer_ptr, NORMAL_PART_NAME, FALSE)))
+        goto rename_error;
       error= (*file)->ha_rename_table(from_buff, to_buff);
       if (error)
         goto rename_error;
@@ -2346,12 +2376,14 @@ rename_error:
   for (abort_file= file, file= m_file; file < abort_file; file++)
   {
     /* Revert the rename, back from 'to' to the original 'from' */
-    create_partition_name(from_buff, from_path, name_buffer_ptr,
-                          NORMAL_PART_NAME, FALSE);
-    create_partition_name(to_buff, to_path, name_buffer_ptr,
-                          NORMAL_PART_NAME, FALSE);
-    /* Ignore error here */
-    (void) (*file)->ha_rename_table(to_buff, from_buff);
+    if (!create_partition_name(from_buff, sizeof(from_buff), from_path,
+                               name_buffer_ptr, NORMAL_PART_NAME, FALSE) &&
+        !create_partition_name(to_buff, sizeof(to_buff), to_path,
+                               name_buffer_ptr, NORMAL_PART_NAME, FALSE))
+    {
+      /* Ignore error here */
+      (void) (*file)->ha_rename_table(to_buff, from_buff);
+    }
     name_buffer_ptr= strend(name_buffer_ptr) + 1;
   }
   DBUG_RETURN(error);
@@ -3420,7 +3452,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
   char *name_buffer_ptr;
   int error= HA_ERR_INITIALIZATION;
   handler **file;
-  char name_buff[FN_REFLEN];
+  char name_buff[FN_REFLEN + 1];
   ulonglong check_table_flags;
   DBUG_ENTER("ha_partition::open");
 
@@ -3474,8 +3506,9 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
     file= m_is_clone_of->m_file;
     for (i= 0; i < m_tot_parts; i++)
     {
-      create_partition_name(name_buff, name, name_buffer_ptr, NORMAL_PART_NAME,
-                            FALSE);
+      if ((error= create_partition_name(name_buff, sizeof(name_buff), name,
+                                name_buffer_ptr, NORMAL_PART_NAME, FALSE)))
+        goto err_handler;
       /* ::clone() will also set ha_share from the original. */
       if (!(m_file[i]= file[i]->clone(name_buff, m_clone_mem_root)))
       {
@@ -3491,8 +3524,9 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
    file= m_file;
    do
    {
-      create_partition_name(name_buff, name, name_buffer_ptr, NORMAL_PART_NAME,
-                            FALSE);
+      if ((error= create_partition_name(name_buff, sizeof(name_buff), name,
+                                name_buffer_ptr, NORMAL_PART_NAME, FALSE)))
+        goto err_handler;
       table->s->connect_string = m_connect_string[(uint)(file-m_file)];
       if ((error= (*file)->ha_open(table, name_buff, mode,
                                    test_if_locked | HA_OPEN_NO_PSI_CALL)))
diff --git a/sql/item.cc b/sql/item.cc
index d25d1110910..7d3f8788c3f 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -5479,6 +5479,12 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
                             ((ref_type == REF_ITEM || ref_type == FIELD_ITEM) ?
                              (Item_ident*) (*reference) :
                              0));
+          if (thd->lex->in_sum_func &&
+              thd->lex->in_sum_func->nest_level >= select->nest_level)
+          {
+            set_if_bigger(thd->lex->in_sum_func->max_arg_level,
+                          select->nest_level);
+          }
           /*
             A reference to a view field had been found and we
             substituted it instead of this Item (find_field_in_tables
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index a7f131f384b..e0ee85dd5a2 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -3131,7 +3131,7 @@ get_date_time_result_type(const char *format, uint length)
   const char *val= format;
   const char *end= format + length;
 
-  for (; val != end && val != end; val++)
+  for (; val != end; val++)
   {
     if (*val == '%' && val+1 != end)
     {
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index a7e8143d78f..31e48a85104 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -609,6 +609,7 @@ const char* partition_info::find_duplicate_field()
 */
 partition_element *partition_info::get_part_elem(const char *partition_name,
                                                  char *file_name,
+                                                 size_t file_name_size,
                                                  uint32 *part_id)
 {
   List_iterator<partition_element> part_it(partitions);
@@ -630,10 +631,10 @@ partition_element *partition_info::get_part_elem(const char *partition_name,
                            sub_part_elem->partition_name, partition_name))
         {
           if (file_name)
-            create_subpartition_name(file_name, "",
-                                     part_elem->partition_name,
-                                     partition_name,
-                                     NORMAL_PART_NAME);
+            if (create_subpartition_name(file_name, file_name_size, "",
+                                         part_elem->partition_name,
+                                         partition_name, NORMAL_PART_NAME))
+              DBUG_RETURN(NULL);
           *part_id= j + (i * num_subparts);
           DBUG_RETURN(sub_part_elem);
         }
@@ -648,8 +649,9 @@ partition_element *partition_info::get_part_elem(const char *partition_name,
                             part_elem->partition_name, partition_name))
     {
       if (file_name)
-        create_partition_name(file_name, "", partition_name,
-                              NORMAL_PART_NAME, TRUE);
+        if (create_partition_name(file_name, file_name_size, "",
+                                  partition_name, NORMAL_PART_NAME, TRUE))
+          DBUG_RETURN(NULL);
       *part_id= i;
       DBUG_RETURN(part_elem);
     }
diff --git a/sql/partition_info.h b/sql/partition_info.h
index 4fdd7e1269c..38a353c8507 100644
--- a/sql/partition_info.h
+++ b/sql/partition_info.h
@@ -328,9 +328,8 @@ public:
   bool check_partition_field_length();
   bool init_column_part(THD *thd);
   bool add_column_list_value(THD *thd, Item *item);
-  partition_element *get_part_elem(const char *partition_name,
-                                   char *file_name,
-                                   uint32 *part_id);
+  partition_element *get_part_elem(const char *partition_name, char *file_name,
+                                   size_t file_name_size, uint32 *part_id);
   void report_part_expr_error(bool use_subpart_expr);
   bool has_same_partitioning(partition_info *new_part_info);
 private:
diff --git a/sql/slave.cc b/sql/slave.cc
index 8cf09215ec8..f632cf4abc8 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2682,6 +2682,7 @@ static void write_ignored_events_info_to_relay_log(THD *thd, Master_info *mi)
     }
     if (rli->ign_gtids.count())
     {
+      DBUG_ASSERT(!rli->is_in_group());         // Ensure no active transaction
       glev= new Gtid_list_log_event(&rli->ign_gtids,
                                     Gtid_list_log_event::FLAG_IGN_GTIDS);
       rli->ign_gtids.reset();
@@ -5971,6 +5972,7 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len)
   bool gtid_skip_enqueue= false;
   bool got_gtid_event= false;
   rpl_gtid event_gtid;
+  static uint dbug_rows_event_count __attribute__((unused))= 0;
   bool is_compress_event = false;
   char* new_buf = NULL;
   char new_buf_arr[4096];
@@ -6042,6 +6044,26 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len)
       (uchar)buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT /* a way to escape */)
     DBUG_RETURN(queue_old_event(mi,buf,event_len));
 
+#ifdef ENABLED_DEBUG_SYNC
+  /*
+    A (+d,dbug.rows_events_to_delay_relay_logging)-test is supposed to
+    create a few Write_log_events and after receiving the 1st of them
+    the IO thread signals to launch the SQL thread, and sets itself to
+    wait for a release signal.
+  */
+  DBUG_EXECUTE_IF("dbug.rows_events_to_delay_relay_logging",
+                  if ((buf[EVENT_TYPE_OFFSET] == WRITE_ROWS_EVENT_V1 ||
+                       buf[EVENT_TYPE_OFFSET] == WRITE_ROWS_EVENT) &&
+                      ++dbug_rows_event_count == 2)
+                  {
+                    const char act[]=
+                      "now SIGNAL start_sql_thread "
+                      "WAIT_FOR go_on_relay_logging";
+                    DBUG_ASSERT(debug_sync_service);
+                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
+                                                       STRING_WITH_LEN(act)));
+                  };);
+#endif
   mysql_mutex_lock(&mi->data_lock);
 
   switch ((uchar)buf[EVENT_TYPE_OFFSET]) {
@@ -7270,9 +7292,12 @@ static Log_event* next_event(rpl_group_info *rgi, ulonglong *event_size)
           DBUG_RETURN(ev);
         }
 
-        if (rli->ign_gtids.count())
+        if (rli->ign_gtids.count() && !rli->is_in_group())
         {
-          /* We generate and return a Gtid_list, to update gtid_slave_pos. */
+          /*
+            We generate and return a Gtid_list, to update gtid_slave_pos,
+            unless being in the middle of a group.
+          */
           DBUG_PRINT("info",("seeing ignored end gtids"));
           ev= new Gtid_list_log_event(&rli->ign_gtids,
                                       Gtid_list_log_event::FLAG_IGN_GTIDS);
diff --git a/sql/sp.cc b/sql/sp.cc
index a01861b3d61..c80078ebe19 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -470,7 +470,8 @@ static TABLE *open_proc_table_for_update(THD *thd)
 */
 
 static int
-db_find_routine_aux(THD *thd, stored_procedure_type type, const sp_name *name,
+db_find_routine_aux(THD *thd, stored_procedure_type type,
+                    const Database_qualified_name *name,
                     TABLE *table)
 {
   uchar key[MAX_KEY_LENGTH];	// db, name, optional key length type
@@ -969,7 +970,7 @@ sp_returns_type(THD *thd, String &result, sp_head *sp)
 */
 static int
 sp_drop_routine_internal(THD *thd, stored_procedure_type type,
-                         const sp_name *name, TABLE *table)
+                         const Database_qualified_name *name, TABLE *table)
 {
   DBUG_ENTER("sp_drop_routine_internal");
 
@@ -1079,11 +1080,11 @@ sp_create_routine(THD *thd, stored_procedure_type type, sp_head *sp)
   else
   {
     /* Checking if the routine already exists */
-    if (db_find_routine_aux(thd, type, lex->spname, table) == SP_OK)
+    if (db_find_routine_aux(thd, type, sp, table) == SP_OK)
     {
       if (lex->create_info.or_replace())
       {
-        if ((ret= sp_drop_routine_internal(thd, type, lex->spname, table)))
+        if ((ret= sp_drop_routine_internal(thd, type, sp, table)))
           goto done;
       }
       else if (lex->create_info.if_not_exists())
@@ -1092,7 +1093,7 @@ sp_create_routine(THD *thd, stored_procedure_type type, sp_head *sp)
                             ER_SP_ALREADY_EXISTS,
                             ER_THD(thd, ER_SP_ALREADY_EXISTS),
                             SP_TYPE_STRING(type),
-                            lex->spname->m_name.str);
+                            sp->m_name.str);
 
         ret= FALSE;
 
diff --git a/sql/sp_cache.cc b/sql/sp_cache.cc
index a97db59b9c6..70ba5084914 100644
--- a/sql/sp_cache.cc
+++ b/sql/sp_cache.cc
@@ -189,7 +189,7 @@ void sp_cache_insert(sp_cache **cp, sp_head *sp)
     NULL if the routine not found.
 */
 
-sp_head *sp_cache_lookup(sp_cache **cp, const sp_name *name)
+sp_head *sp_cache_lookup(sp_cache **cp, const Database_qualified_name *name)
 {
   char buf[NAME_LEN * 2 + 2];
   sp_cache *c= *cp;
diff --git a/sql/sp_cache.h b/sql/sp_cache.h
index 4ab9240430a..51886a61ee9 100644
--- a/sql/sp_cache.h
+++ b/sql/sp_cache.h
@@ -32,7 +32,7 @@
 
 class sp_head;
 class sp_cache;
-class sp_name;
+class Database_qualified_name;
 
 /*
   Cache usage scenarios:
@@ -59,7 +59,7 @@ void sp_cache_init();
 void sp_cache_end();
 void sp_cache_clear(sp_cache **cp);
 void sp_cache_insert(sp_cache **cp, sp_head *sp);
-sp_head *sp_cache_lookup(sp_cache **cp, const sp_name *name);
+sp_head *sp_cache_lookup(sp_cache **cp, const Database_qualified_name *name);
 void sp_cache_invalidate();
 void sp_cache_flush_obsolete(sp_cache **cp, sp_head **sp);
 ulong sp_cache_version();
diff --git a/sql/sql_analyze_stmt.cc b/sql/sql_analyze_stmt.cc
index cc6e0f89f75..ac3797aae60 100644
--- a/sql/sql_analyze_stmt.cc
+++ b/sql/sql_analyze_stmt.cc
@@ -26,7 +26,11 @@
 void Filesort_tracker::print_json_members(Json_writer *writer)
 {
   const char *varied_str= "(varied across executions)";
-  writer->add_member("r_loops").add_ll(get_r_loops());
+
+  if (!get_r_loops())
+    writer->add_member("r_loops").add_null();
+  else
+    writer->add_member("r_loops").add_ll(get_r_loops());
   
   if (get_r_loops() && time_tracker.timed)
   {
@@ -36,22 +40,29 @@ void Filesort_tracker::print_json_members(Json_writer *writer)
   if (r_limit != HA_POS_ERROR)
   {
     writer->add_member("r_limit");
-    if (r_limit == 0)
+    if (!get_r_loops())
+      writer->add_null();
+    else if (r_limit == 0)
       writer->add_str(varied_str);
     else
       writer->add_ll((longlong) rint(r_limit/get_r_loops()));
   }
 
   writer->add_member("r_used_priority_queue"); 
-  if (r_used_pq == get_r_loops())
+  if (!get_r_loops())
+    writer->add_null();
+  else if (r_used_pq == get_r_loops())
     writer->add_bool(true);
   else if (r_used_pq == 0)
     writer->add_bool(false);
   else
     writer->add_str(varied_str);
 
-  writer->add_member("r_output_rows").add_ll((longlong) rint(r_output_rows / 
-                                                             get_r_loops()));
+  if (!get_r_loops())
+    writer->add_member("r_output_rows").add_null();
+  else
+    writer->add_member("r_output_rows").add_ll((longlong) rint(r_output_rows /
+                                                              get_r_loops()));
 
   if (sort_passes)
   {
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 449aded32bd..145ccb76d11 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -4140,7 +4140,7 @@ void Security_context::destroy()
   if (external_user)
   {
     my_free(external_user);
-    user= NULL;
+    external_user= NULL;
   }
 
   my_free((char*) ip);
@@ -4358,6 +4358,10 @@ extern "C" enum thd_kill_levels thd_kill_level(const MYSQL_THD thd)
    however not more often than global.progress_report_time.
    If global.progress_report_time is 0, then don't send progress reports, but
    check every second if the value has changed
+
+  We clear any errors that we get from sending the progress packet to
+  the client as we don't want to set an error without the caller knowing
+  about it.
 */
 
 static void thd_send_progress(THD *thd)
@@ -4374,8 +4378,12 @@ static void thd_send_progress(THD *thd)
     thd->progress.next_report_time= (report_time +
                                      seconds_to_next * 1000000000ULL);
     if (global_system_variables.progress_report_time &&
-        thd->variables.progress_report_time)
+        thd->variables.progress_report_time && !thd->is_error())
+    {
       net_send_progress_packet(thd);
+      if (thd->is_error())
+        thd->clear_error();
+    }
   }
 }
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index e77d4911b81..1d4a2ac8851 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2935,8 +2935,8 @@ static int mysql_create_routine(THD *thd, LEX *lex)
   /* Checking the drop permissions if CREATE OR REPLACE is used */
   if (lex->create_info.or_replace())
   {
-    if (check_routine_access(thd, ALTER_PROC_ACL, lex->spname->m_db.str,
-                             lex->spname->m_name.str,
+    if (check_routine_access(thd, ALTER_PROC_ACL, lex->sphead->m_db.str,
+                             lex->sphead->m_name.str,
                              lex->sql_command == SQLCOM_DROP_PROCEDURE, 0))
       return true;
   }
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 9df53b9b4d3..c3417ce4f08 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -5716,8 +5716,8 @@ static bool write_log_changed_partitions(ALTER_PARTITION_PARAM_TYPE *lpt,
   DDL_LOG_ENTRY ddl_log_entry;
   partition_info *part_info= lpt->part_info;
   DDL_LOG_MEMORY_ENTRY *log_entry;
-  char tmp_path[FN_REFLEN];
-  char normal_path[FN_REFLEN];
+  char tmp_path[FN_REFLEN + 1];
+  char normal_path[FN_REFLEN + 1];
   List_iterator<partition_element> part_it(part_info->partitions);
   uint temp_partitions= part_info->temp_partitions.elements;
   uint num_elements= part_info->partitions.elements;
@@ -5741,14 +5741,15 @@ static bool write_log_changed_partitions(ALTER_PARTITION_PARAM_TYPE *lpt,
           ddl_log_entry.next_entry= *next_entry;
           ddl_log_entry.handler_name=
                ha_resolve_storage_engine_name(sub_elem->engine_type);
-          create_subpartition_name(tmp_path, path,
-                                   part_elem->partition_name,
-                                   sub_elem->partition_name,
-                                   TEMP_PART_NAME);
-          create_subpartition_name(normal_path, path,
-                                   part_elem->partition_name,
-                                   sub_elem->partition_name,
-                                   NORMAL_PART_NAME);
+          if (create_subpartition_name(tmp_path, sizeof(tmp_path), path,
+                                       part_elem->partition_name,
+                                       sub_elem->partition_name,
+                                       TEMP_PART_NAME) ||
+              create_subpartition_name(normal_path, sizeof(normal_path), path,
+                                       part_elem->partition_name,
+                                       sub_elem->partition_name,
+                                       NORMAL_PART_NAME))
+            DBUG_RETURN(TRUE);
           ddl_log_entry.name= normal_path;
           ddl_log_entry.from_name= tmp_path;
           if (part_elem->part_state == PART_IS_CHANGED)
@@ -5769,12 +5770,13 @@ static bool write_log_changed_partitions(ALTER_PARTITION_PARAM_TYPE *lpt,
         ddl_log_entry.next_entry= *next_entry;
         ddl_log_entry.handler_name=
                ha_resolve_storage_engine_name(part_elem->engine_type);
-        create_partition_name(tmp_path, path,
-                              part_elem->partition_name,
-                              TEMP_PART_NAME, TRUE);
-        create_partition_name(normal_path, path,
-                              part_elem->partition_name,
-                              NORMAL_PART_NAME, TRUE);
+        if (create_partition_name(tmp_path, sizeof(tmp_path), path,
+                                  part_elem->partition_name, TEMP_PART_NAME,
+                                  TRUE) ||
+            create_partition_name(normal_path, sizeof(normal_path), path,
+                                  part_elem->partition_name, NORMAL_PART_NAME,
+                                  TRUE))
+          DBUG_RETURN(TRUE);
         ddl_log_entry.name= normal_path;
         ddl_log_entry.from_name= tmp_path;
         if (part_elem->part_state == PART_IS_CHANGED)
@@ -5813,7 +5815,7 @@ static bool write_log_dropped_partitions(ALTER_PARTITION_PARAM_TYPE *lpt,
   DDL_LOG_ENTRY ddl_log_entry;
   partition_info *part_info= lpt->part_info;
   DDL_LOG_MEMORY_ENTRY *log_entry;
-  char tmp_path[FN_LEN];
+  char tmp_path[FN_REFLEN + 1];
   List_iterator<partition_element> part_it(part_info->partitions);
   List_iterator<partition_element> temp_it(part_info->temp_partitions);
   uint num_temp_partitions= part_info->temp_partitions.elements;
@@ -5852,10 +5854,10 @@ static bool write_log_dropped_partitions(ALTER_PARTITION_PARAM_TYPE *lpt,
           ddl_log_entry.next_entry= *next_entry;
           ddl_log_entry.handler_name=
                ha_resolve_storage_engine_name(sub_elem->engine_type);
-          create_subpartition_name(tmp_path, path,
-                                   part_elem->partition_name,
-                                   sub_elem->partition_name,
-                                   name_variant);
+          if (create_subpartition_name(tmp_path, sizeof(tmp_path), path,
+                                       part_elem->partition_name,
+                                       sub_elem->partition_name, name_variant))
+            DBUG_RETURN(TRUE);
           ddl_log_entry.name= tmp_path;
           if (write_ddl_log_entry(&ddl_log_entry, &log_entry))
           {
@@ -5871,9 +5873,10 @@ static bool write_log_dropped_partitions(ALTER_PARTITION_PARAM_TYPE *lpt,
         ddl_log_entry.next_entry= *next_entry;
         ddl_log_entry.handler_name=
                ha_resolve_storage_engine_name(part_elem->engine_type);
-        create_partition_name(tmp_path, path,
-                              part_elem->partition_name,
-                              name_variant, TRUE);
+        if (create_partition_name(tmp_path, sizeof(tmp_path), path,
+                                  part_elem->partition_name, name_variant,
+                                  TRUE))
+          DBUG_RETURN(TRUE);
         ddl_log_entry.name= tmp_path;
         if (write_ddl_log_entry(&ddl_log_entry, &log_entry))
         {
@@ -8031,31 +8034,41 @@ static uint32 get_next_subpartition_via_walking(PARTITION_ITERATOR *part_iter)
   return res;
 }
 
+/* used in error messages below */
+static const char *longest_str(const char *s1, const char *s2,
+                               const char *s3=0)
+{
+  if (strlen(s2) > strlen(s1)) s1= s2;
+  if (s3 && strlen(s3) > strlen(s1)) s1= s3;
+  return s1;
+}
+
 
 /*
   Create partition names
 
   SYNOPSIS
     create_partition_name()
-    out:out                   Created partition name string
+    out:out                   The buffer for the created partition name string
+                              must be *at least* of FN_REFLEN+1 bytes
     in1                       First part
     in2                       Second part
     name_variant              Normal, temporary or renamed partition name
 
   RETURN VALUE
-    NONE
+    0 if ok, error if name too long
 
   DESCRIPTION
     This method is used to calculate the partition name, service routine to
     the del_ren_cre_table method.
 */
 
-void create_partition_name(char *out, const char *in1,
-                           const char *in2, uint name_variant,
-                           bool translate)
+int create_partition_name(char *out, size_t outlen, const char *in1,
+                          const char *in2, uint name_variant, bool translate)
 {
   char transl_part_name[FN_REFLEN];
-  const char *transl_part;
+  const char *transl_part, *end;
+  DBUG_ASSERT(outlen >= FN_REFLEN + 1); // consistency! same limit everywhere
 
   if (translate)
   {
@@ -8065,11 +8078,17 @@ void create_partition_name(char *out, const char *in1,
   else
     transl_part= in2;
   if (name_variant == NORMAL_PART_NAME)
-    strxmov(out, in1, "#P#", transl_part, NullS);
+    end= strxnmov(out, outlen-1, in1, "#P#", transl_part, NullS);
   else if (name_variant == TEMP_PART_NAME)
-    strxmov(out, in1, "#P#", transl_part, "#TMP#", NullS);
+    end= strxnmov(out, outlen-1, in1, "#P#", transl_part, "#TMP#", NullS);
   else if (name_variant == RENAMED_PART_NAME)
-    strxmov(out, in1, "#P#", transl_part, "#REN#", NullS);
+    end= strxnmov(out, outlen-1, in1, "#P#", transl_part, "#REN#", NullS);
+  if (end - out == static_cast<ptrdiff_t>(outlen-1))
+  {
+    my_error(ER_PATH_LENGTH, MYF(0), longest_str(in1, transl_part));
+    return HA_WRONG_CREATE_OPTION;
+  }
+  return 0;
 }
 
 
@@ -8078,37 +8097,46 @@ void create_partition_name(char *out, const char *in1,
 
   SYNOPSIS
     create_subpartition_name()
-    out:out                   Created partition name string
+    out:out                   The buffer for the created partition name string
+                              must be *at least* of FN_REFLEN+1 bytes
     in1                       First part
     in2                       Second part
     in3                       Third part
     name_variant              Normal, temporary or renamed partition name
 
   RETURN VALUE
-    NONE
+    0 if ok, error if name too long
 
   DESCRIPTION
   This method is used to calculate the subpartition name, service routine to
   the del_ren_cre_table method.
 */
 
-void create_subpartition_name(char *out, const char *in1,
-                              const char *in2, const char *in3,
-                              uint name_variant)
+int create_subpartition_name(char *out, size_t outlen,
+                             const char *in1, const char *in2,
+                             const char *in3, uint name_variant)
 {
-  char transl_part_name[FN_REFLEN], transl_subpart_name[FN_REFLEN];
+  char transl_part_name[FN_REFLEN], transl_subpart_name[FN_REFLEN], *end;
+  DBUG_ASSERT(outlen >= FN_REFLEN + 1); // consistency! same limit everywhere
 
   tablename_to_filename(in2, transl_part_name, FN_REFLEN);
   tablename_to_filename(in3, transl_subpart_name, FN_REFLEN);
   if (name_variant == NORMAL_PART_NAME)
-    strxmov(out, in1, "#P#", transl_part_name,
-            "#SP#", transl_subpart_name, NullS);
+    end= strxnmov(out, outlen-1, in1, "#P#", transl_part_name,
+                  "#SP#", transl_subpart_name, NullS);
   else if (name_variant == TEMP_PART_NAME)
-    strxmov(out, in1, "#P#", transl_part_name,
-            "#SP#", transl_subpart_name, "#TMP#", NullS);
+    end= strxnmov(out, outlen-1, in1, "#P#", transl_part_name,
+                  "#SP#", transl_subpart_name, "#TMP#", NullS);
   else if (name_variant == RENAMED_PART_NAME)
-    strxmov(out, in1, "#P#", transl_part_name,
-            "#SP#", transl_subpart_name, "#REN#", NullS);
+    end= strxnmov(out, outlen-1, in1, "#P#", transl_part_name,
+                  "#SP#", transl_subpart_name, "#REN#", NullS);
+  if (end - out == static_cast<ptrdiff_t>(outlen-1))
+  {
+    my_error(ER_PATH_LENGTH, MYF(0),
+             longest_str(in1, transl_part_name, transl_subpart_name));
+    return HA_WRONG_CREATE_OPTION;
+  }
+  return 0;
 }
 
 uint get_partition_field_store_length(Field *field)
diff --git a/sql/sql_partition.h b/sql/sql_partition.h
index 3009d201bcd..b0dede7487e 100644
--- a/sql/sql_partition.h
+++ b/sql/sql_partition.h
@@ -280,12 +280,12 @@ bool partition_key_modified(TABLE *table, const MY_BITMAP *fields);
 #define partition_key_modified(X,Y) 0
 #endif
 
-void create_partition_name(char *out, const char *in1,
-                           const char *in2, uint name_variant,
-                           bool translate);
-void create_subpartition_name(char *out, const char *in1,
-                              const char *in2, const char *in3,
-                              uint name_variant);
+int __attribute__((warn_unused_result))
+  create_partition_name(char *out, size_t outlen, const char *in1, const char
+                        *in2, uint name_variant, bool translate);
+int __attribute__((warn_unused_result))
+  create_subpartition_name(char *out, size_t outlen, const char *in1, const
+                           char *in2, const char *in3, uint name_variant);
 
 void set_key_field_ptr(KEY *key_info, const uchar *new_buf,
                        const uchar *old_buf);
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc
index c727d749300..ed330bcc7b9 100644
--- a/sql/sql_partition_admin.cc
+++ b/sql/sql_partition_admin.cc
@@ -485,7 +485,7 @@ bool Sql_cmd_alter_table_exchange_partition::
   partition_element *part_elem;
   const char *partition_name;
   char temp_name[FN_REFLEN+1];
-  char part_file_name[FN_REFLEN+1];
+  char part_file_name[2*FN_REFLEN+1];
   char swap_file_name[FN_REFLEN+1];
   char temp_file_name[FN_REFLEN+1];
   uint swap_part_id;
@@ -580,9 +580,9 @@ bool Sql_cmd_alter_table_exchange_partition::
                        temp_name, "", FN_IS_TMP);
 
   if (!(part_elem= part_table->part_info->get_part_elem(partition_name,
-                                                        part_file_name +
-                                                          part_file_name_len,
-                                                        &swap_part_id)))
+                                  part_file_name + part_file_name_len,
+                                  sizeof(part_file_name) - part_file_name_len,
+                                  &swap_part_id)))
   {
  // my_error(ER_UNKNOWN_PARTITION, MYF(0), partition_name,
  //          part_table->alias);
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 995821fd8a4..b3f56f314d2 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -16683,7 +16683,6 @@ sf_tail:
             if (!Lex->make_sp_head_no_recursive(thd, $1, $2,
                                                 TYPE_ENUM_FUNCTION))
               MYSQL_YYABORT;
-            Lex->spname= $2;
           }
           sp_parenthesized_fdparam_list
           sf_return_type
@@ -16719,7 +16718,6 @@ sp_tail:
             if (!Lex->make_sp_head_no_recursive(thd, $1, $2,
                                                 TYPE_ENUM_PROCEDURE))
               MYSQL_YYABORT;
-            Lex->spname= $2;
           }
           sp_parenthesized_pdparam_list
           sp_c_chistics
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
index c21bcf32566..114b117b7cb 100644
--- a/sql/sql_yacc_ora.yy
+++ b/sql/sql_yacc_ora.yy
@@ -16922,7 +16922,6 @@ sf_tail:
             if (!Lex->make_sp_head_no_recursive(thd, $1, $2,
                                                 TYPE_ENUM_FUNCTION))
               MYSQL_YYABORT;
-            Lex->spname= $2;
           }
           opt_sp_parenthesized_fdparam_list
           sf_return_type
@@ -16961,7 +16960,6 @@ sp_tail:
             if (!Lex->make_sp_head_no_recursive(thd, $1, $2,
                                                 TYPE_ENUM_PROCEDURE))
               MYSQL_YYABORT;
-            Lex->spname= $2;
           }
           opt_sp_parenthesized_pdparam_list
           sp_c_chistics
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index 810c0fd9c4d..7f83905547b 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -1708,7 +1708,6 @@ int ha_archive::info(uint flag)
       stats.update_time= (ulong) file_stat.st_mtime;
     if (flag & HA_STATUS_CONST)
     {
-      stats.max_data_file_length= share->rows_recorded * stats.mean_rec_length;
       stats.max_data_file_length= MAX_FILE_SIZE;
       stats.create_time= (ulong) file_stat.st_ctime;
     }
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index e143ed793e4..defa11ad6b4 100644
--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -1263,6 +1263,7 @@ static my_bool translog_set_lsn_for_files(uint32 from_file, uint32 to_file,
           mysql_file_close(fd, MYF(MY_WME))))
     {
       translog_stop_writing();
+      mysql_mutex_unlock(&log_descriptor.file_header_lock);
       DBUG_RETURN(1);
     }
   }
@@ -2277,10 +2278,11 @@ static void translog_set_only_in_buffers(TRANSLOG_ADDRESS in_buffers)
   if (cmp_translog_addr(in_buffers, log_descriptor.in_buffers_only) > 0)
   {
     if (translog_status != TRANSLOG_OK)
-      DBUG_VOID_RETURN;
+      goto end;
     log_descriptor.in_buffers_only= in_buffers;
     DBUG_PRINT("info", ("set new in_buffers_only"));
   }
+end:
   mysql_mutex_unlock(&log_descriptor.sent_to_disk_lock);
   DBUG_VOID_RETURN;
 }
diff --git a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c
index caaaacfc9b1..a1c407967b7 100644
--- a/storage/maria/ma_pagecache.c
+++ b/storage/maria/ma_pagecache.c
@@ -3475,6 +3475,7 @@ restart:
                             lock_to_read[lock].unlock_lock,
                             unlock_pin, FALSE))
       {
+        pagecache_pthread_mutex_unlock(&pagecache->cache_lock);
         DBUG_ASSERT(0);
         return (uchar*) 0;
       }
diff --git a/storage/mroonga/mrn_table.cpp b/storage/mroonga/mrn_table.cpp
index 629c96d3e1a..8984db3bfbf 100644
--- a/storage/mroonga/mrn_table.cpp
+++ b/storage/mroonga/mrn_table.cpp
@@ -202,7 +202,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
                             const TABLE *table, partition_element **part_elem,
                             partition_element **sub_elem)
 {
-  char tmp_name[FN_LEN];
+  char tmp_name[FN_REFLEN + 1];
   partition_info *part_info = table->part_info;
   partition_element *tmp_part_elem = NULL, *tmp_sub_elem = NULL;
   bool tmp_flg = FALSE, tmp_find_flg = FALSE;
@@ -224,9 +224,10 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
       List_iterator<partition_element> sub_it((*part_elem)->subpartitions);
       while ((*sub_elem = sub_it++))
       {
-        create_subpartition_name(tmp_name, table->s->path.str,
-          (*part_elem)->partition_name, (*sub_elem)->partition_name,
-          NORMAL_PART_NAME);
+        if (create_subpartition_name(tmp_name, sizeof(tmp_name), table->s->path.str,
+            (*part_elem)->partition_name, (*sub_elem)->partition_name,
+          NORMAL_PART_NAME))
+          DBUG_VOID_RETURN;
         DBUG_PRINT("info", ("mroonga tmp_name=%s", tmp_name));
         if (table_name && !memcmp(table_name, tmp_name, table_name_length + 1))
           DBUG_VOID_RETURN;
@@ -243,8 +244,9 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
         }
       }
     } else {
-      create_partition_name(tmp_name, table->s->path.str,
-        (*part_elem)->partition_name, NORMAL_PART_NAME, TRUE);
+      if (create_partition_name(tmp_name, sizeof(tmp_name), table->s->path.str,
+          (*part_elem)->partition_name, NORMAL_PART_NAME, TRUE))
+        DBUG_VOID_RETURN;
       DBUG_PRINT("info", ("mroonga tmp_name=%s", tmp_name));
       if (table_name && !memcmp(table_name, tmp_name, table_name_length + 1))
         DBUG_VOID_RETURN;
diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff
index 22e3447e00a..9ba985f7adc 100644
--- a/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff
@@ -27,7 +27,7 @@
 -  `c` char(8) DEFAULT NULL,
 -  PRIMARY KEY (`a`)
 -) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
-- PARTITION BY HASH (a)
+- PARTITION BY HASH (`a`)
 -PARTITIONS 2
 -INSERT INTO t1 (c) VALUES ('a'),('b'),('c');
 -SHOW CREATE TABLE t1;
@@ -37,7 +37,7 @@
 -  `c` char(8) DEFAULT NULL,
 -  PRIMARY KEY (`a`)
 -) ENGINE=<STORAGE_ENGINE> AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
-- PARTITION BY HASH (a)
+- PARTITION BY HASH (`a`)
 -PARTITIONS 2
 -TRUNCATE TABLE t1;
 -SHOW CREATE TABLE t1;
@@ -47,7 +47,7 @@
 -  `c` char(8) DEFAULT NULL,
 -  PRIMARY KEY (`a`)
 -) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
-- PARTITION BY HASH (a)
+- PARTITION BY HASH (`a`)
 -PARTITIONS 2
 -INSERT INTO t1 (c) VALUES ('d');
 -SHOW CREATE TABLE t1;
@@ -57,7 +57,7 @@
 -  `c` char(8) DEFAULT NULL,
 -  PRIMARY KEY (`a`)
 -) ENGINE=<STORAGE_ENGINE> AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-- PARTITION BY HASH (a)
+- PARTITION BY HASH (`a`)
 -PARTITIONS 2
 -SELECT a,c FROM t1;
 -a	c
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc
index e980a42eef0..4b677b3b2fe 100644
--- a/storage/spider/spd_table.cc
+++ b/storage/spider/spd_table.cc
@@ -6937,7 +6937,7 @@ void spider_get_partition_info(
   partition_element **part_elem,
   partition_element **sub_elem
 ) {
-  char tmp_name[FN_LEN];
+  char tmp_name[FN_REFLEN + 1];
   partition_element *tmp_part_elem = NULL, *tmp_sub_elem = NULL;
   bool tmp_flg = FALSE, tmp_find_flg = FALSE;
   DBUG_ENTER("spider_get_partition_info");
@@ -6958,9 +6958,10 @@ void spider_get_partition_info(
       List_iterator<partition_element> sub_it((*part_elem)->subpartitions);
       while ((*sub_elem = sub_it++))
       {
-        create_subpartition_name(tmp_name, table_share->path.str,
-          (*part_elem)->partition_name, (*sub_elem)->partition_name,
-          NORMAL_PART_NAME);
+        if (create_subpartition_name(tmp_name, sizeof(tmp_name),
+            table_share->path.str, (*part_elem)->partition_name,
+            (*sub_elem)->partition_name, NORMAL_PART_NAME))
+          DBUG_VOID_RETURN;
         DBUG_PRINT("info",("spider tmp_name=%s", tmp_name));
         if (!memcmp(table_name, tmp_name, table_name_length + 1))
           DBUG_VOID_RETURN;
@@ -6976,8 +6977,10 @@ void spider_get_partition_info(
         }
       }
     } else {
-      create_partition_name(tmp_name, table_share->path.str,
-        (*part_elem)->partition_name, NORMAL_PART_NAME, TRUE);
+      if (create_partition_name(tmp_name, sizeof(tmp_name),
+          table_share->path.str, (*part_elem)->partition_name,
+          NORMAL_PART_NAME, TRUE))
+        DBUG_VOID_RETURN;
       DBUG_PRINT("info",("spider tmp_name=%s", tmp_name));
       if (!memcmp(table_name, tmp_name, table_name_length + 1))
         DBUG_VOID_RETURN;
@@ -8443,7 +8446,7 @@ int spider_discover_table_structure(
     spider_free_share_resource_only(spider_share);
 #ifdef WITH_PARTITION_STORAGE_ENGINE
   } else {
-    char tmp_name[FN_LEN];
+    char tmp_name[FN_REFLEN + 1];
     List_iterator<partition_element> part_it(part_info->partitions);
     partition_element *part_elem, *sub_elem;
     while ((part_elem = part_it++))
@@ -8454,9 +8457,10 @@ int spider_discover_table_structure(
         while ((sub_elem = sub_it++))
         {
           str.length(str_len);
-          create_subpartition_name(tmp_name, table_name,
-            (part_elem)->partition_name, (sub_elem)->partition_name,
-            NORMAL_PART_NAME);
+          if (create_subpartition_name(tmp_name, sizeof(tmp_name), table_name,
+              (part_elem)->partition_name, (sub_elem)->partition_name,
+              NORMAL_PART_NAME))
+            DBUG_RETURN(1);
           DBUG_PRINT("info",("spider tmp_name=%s", tmp_name));
           if (!(spider_share = spider_create_share(table_name, share,
             part_info,
@@ -8479,8 +8483,9 @@ int spider_discover_table_structure(
           break;
       } else {
         str.length(str_len);
-        create_partition_name(tmp_name, table_name,
-          (part_elem)->partition_name, NORMAL_PART_NAME, TRUE);
+        if (create_partition_name(tmp_name, sizeof(tmp_name), table_name,
+            (part_elem)->partition_name, NORMAL_PART_NAME, TRUE))
+          DBUG_RETURN(1);
         DBUG_PRINT("info",("spider tmp_name=%s", tmp_name));
         if (!(spider_share = spider_create_share(table_name, share,
           part_info,
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result
index 370359327c1..6bb98671feb 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result
@@ -620,15 +620,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` int(11) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (abs(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (abs(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	15
@@ -2317,15 +2317,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` int(11) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (mod(col1,10))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (`col1` % 10)
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	15
@@ -3667,15 +3667,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (day(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (dayofmonth(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-05
@@ -4184,15 +4184,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (dayofmonth(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (dayofmonth(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-05
@@ -4701,15 +4701,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (dayofweek(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (dayofweek(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -5230,15 +5230,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (dayofyear(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (dayofyear(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -5749,15 +5749,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (extract(month from col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (extract(month from `col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -6268,15 +6268,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (hour(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (hour(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	09:09:15
@@ -6793,15 +6793,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time(6) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (microsecond(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (microsecond(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	05:30:34.000037
@@ -7314,15 +7314,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (minute(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (minute(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	10:24:23
@@ -7845,15 +7845,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (second(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (second(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	09:09:15
@@ -8376,15 +8376,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (month(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (month(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -8901,15 +8901,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (quarter(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (quarter(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -9424,15 +9424,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (weekday(col1))
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (weekday(`col1`))
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -9945,15 +9945,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (year(col1)-1990)
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (year(`col1`) - 1990)
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -10470,15 +10470,15 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (colint)
-SUBPARTITION BY HASH (yearweek(col1)-200600)
+ PARTITION BY LIST (`colint`)
+SUBPARTITION BY HASH (yearweek(`col1`,0) - 200600)
 SUBPARTITIONS 5
-(PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
- PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
- PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
- PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
- PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
+(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB,
+ PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB,
+ PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = TokuDB,
+ PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = TokuDB,
+ PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result
index 5ee7ced4487..3d944dccdb1 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result
@@ -75,7 +75,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -567,7 +567,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -1067,15 +1067,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1572,13 +1572,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2071,13 +2071,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2574,20 +2574,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3084,20 +3084,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3592,12 +3592,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4089,7 +4089,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4581,7 +4581,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -5081,15 +5081,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5586,13 +5586,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6085,13 +6085,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6588,20 +6588,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7098,20 +7098,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7606,12 +7606,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8104,7 +8104,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8612,7 +8612,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -9128,15 +9128,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9649,13 +9649,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10164,13 +10164,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10683,20 +10683,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11209,20 +11209,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11733,12 +11733,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12246,7 +12246,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -12754,7 +12754,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -13270,15 +13270,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13791,13 +13791,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14306,13 +14306,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14825,20 +14825,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15351,20 +15351,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15875,12 +15875,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16390,7 +16390,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -16883,7 +16883,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -17384,15 +17384,15 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17890,13 +17890,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18390,13 +18390,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18894,20 +18894,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19405,20 +19405,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19914,12 +19914,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20412,7 +20412,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -20905,7 +20905,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -21406,15 +21406,15 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21912,13 +21912,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22412,13 +22412,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22916,20 +22916,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23427,20 +23427,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23936,12 +23936,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24434,7 +24434,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -24927,7 +24927,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -25428,15 +25428,15 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25934,13 +25934,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26434,13 +26434,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26938,20 +26938,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27449,20 +27449,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27958,12 +27958,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result
index 17f4c83cd97..7ad3d72441c 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result
@@ -393,7 +393,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -885,7 +885,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -1385,15 +1385,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1890,13 +1890,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2389,13 +2389,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2894,20 +2894,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3404,20 +3404,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3912,12 +3912,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4409,7 +4409,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4901,7 +4901,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -5401,15 +5401,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5906,13 +5906,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6405,13 +6405,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6910,20 +6910,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7420,20 +7420,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7928,12 +7928,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8426,7 +8426,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8934,7 +8934,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -9450,15 +9450,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9971,13 +9971,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10486,13 +10486,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11007,20 +11007,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11533,20 +11533,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12057,12 +12057,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12570,7 +12570,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -13078,7 +13078,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -13594,15 +13594,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14115,13 +14115,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14630,13 +14630,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15151,20 +15151,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15677,20 +15677,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16201,12 +16201,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result
index 3cedec4c908..9f53437fdf7 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result
@@ -73,7 +73,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -513,7 +513,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -961,15 +961,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1414,13 +1414,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1861,13 +1861,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2314,20 +2314,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2772,20 +2772,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3228,12 +3228,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3673,7 +3673,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4113,7 +4113,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -4561,15 +4561,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5014,13 +5014,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5461,13 +5461,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5914,20 +5914,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6372,20 +6372,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6828,12 +6828,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7273,7 +7273,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -7729,7 +7729,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -8193,15 +8193,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8662,13 +8662,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9125,13 +9125,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9594,20 +9594,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10068,20 +10068,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10540,12 +10540,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11005,7 +11005,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -11445,7 +11445,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -11893,15 +11893,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12346,13 +12346,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12793,13 +12793,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13244,20 +13244,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13702,20 +13702,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14158,12 +14158,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14603,7 +14603,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -15043,7 +15043,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -15491,15 +15491,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15944,13 +15944,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16391,13 +16391,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16842,20 +16842,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17300,20 +17300,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17756,12 +17756,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18202,7 +18202,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -18658,7 +18658,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -19122,15 +19122,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19591,13 +19591,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20054,13 +20054,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20521,20 +20521,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20995,20 +20995,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21467,12 +21467,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21928,7 +21928,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -22384,7 +22384,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -22848,15 +22848,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23317,13 +23317,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23780,13 +23780,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24247,20 +24247,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24721,20 +24721,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25193,12 +25193,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25655,7 +25655,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -26095,7 +26095,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -26543,15 +26543,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26996,13 +26996,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27443,13 +27443,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27894,20 +27894,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28352,20 +28352,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28808,12 +28808,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29253,7 +29253,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -29693,7 +29693,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -30141,15 +30141,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30594,13 +30594,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31041,13 +31041,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31492,20 +31492,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31950,20 +31950,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32406,12 +32406,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32851,7 +32851,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -33307,7 +33307,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -33771,15 +33771,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34240,13 +34240,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34703,13 +34703,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35170,20 +35170,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35644,20 +35644,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36116,12 +36116,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result
index 030e3e2204d..d994f5f2654 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result
@@ -74,7 +74,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -530,7 +530,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -994,15 +994,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1463,13 +1463,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1926,13 +1926,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2395,20 +2395,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2869,20 +2869,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3341,12 +3341,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3804,7 +3804,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4298,7 +4298,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -4800,15 +4800,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5307,13 +5307,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5808,13 +5808,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6315,20 +6315,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6827,20 +6827,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7337,12 +7337,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7836,7 +7836,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8330,7 +8330,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -8832,15 +8832,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9339,13 +9339,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9840,13 +9840,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10347,20 +10347,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10859,20 +10859,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11369,12 +11369,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11869,7 +11869,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -12377,7 +12377,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -12893,15 +12893,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13414,13 +13414,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13929,13 +13929,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14450,20 +14450,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14976,20 +14976,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15500,12 +15500,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16013,7 +16013,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -16521,7 +16521,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -17037,15 +17037,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17558,13 +17558,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18073,13 +18073,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18594,20 +18594,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19120,20 +19120,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19644,12 +19644,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result
index f252760e0a5..f8c7eadb44c 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result
@@ -70,7 +70,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -526,7 +526,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -990,15 +990,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1459,13 +1459,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1922,13 +1922,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2389,20 +2389,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2863,20 +2863,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3335,12 +3335,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3798,7 +3798,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4293,7 +4293,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -4796,15 +4796,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5304,13 +5304,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5806,13 +5806,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6312,20 +6312,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6825,20 +6825,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7336,12 +7336,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7836,7 +7836,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8331,7 +8331,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -8834,15 +8834,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9342,13 +9342,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9844,13 +9844,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10350,20 +10350,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10863,20 +10863,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11374,12 +11374,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11875,7 +11875,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -12383,7 +12383,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -12899,15 +12899,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13420,13 +13420,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13935,13 +13935,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14454,20 +14454,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14980,20 +14980,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15504,12 +15504,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16017,7 +16017,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -16525,7 +16525,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -17041,15 +17041,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17562,13 +17562,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18077,13 +18077,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18596,20 +18596,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19122,20 +19122,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19646,12 +19646,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result
index 32dab941bf1..1a4d1210a23 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result
@@ -74,7 +74,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -532,7 +532,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -998,15 +998,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1469,13 +1469,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1932,13 +1932,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2403,20 +2403,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2877,20 +2877,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3351,12 +3351,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3815,7 +3815,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4311,7 +4311,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -4815,15 +4815,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5324,13 +5324,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5825,13 +5825,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6334,20 +6334,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6846,20 +6846,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7358,12 +7358,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7859,7 +7859,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8355,7 +8355,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -8859,15 +8859,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9368,13 +9368,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9869,13 +9869,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10378,20 +10378,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10890,20 +10890,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11402,12 +11402,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11904,7 +11904,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -12414,7 +12414,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -12932,15 +12932,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13455,13 +13455,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13970,13 +13970,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14493,20 +14493,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15019,20 +15019,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15545,12 +15545,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16060,7 +16060,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -16570,7 +16570,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -17088,15 +17088,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17611,13 +17611,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18126,13 +18126,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18649,20 +18649,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19175,20 +19175,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19701,12 +19701,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result
index 4200c75867f..36be0936c09 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result
@@ -69,7 +69,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -528,7 +528,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -995,15 +995,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1467,13 +1467,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1935,13 +1935,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2407,20 +2407,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2886,20 +2886,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3361,12 +3361,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3827,7 +3827,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4325,7 +4325,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -4831,15 +4831,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5342,13 +5342,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5849,13 +5849,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6360,20 +6360,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6878,20 +6878,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7392,12 +7392,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7895,7 +7895,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8393,7 +8393,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -8899,15 +8899,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9410,13 +9410,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9917,13 +9917,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10428,20 +10428,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10946,20 +10946,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11460,12 +11460,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11964,7 +11964,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -12475,7 +12475,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -12994,15 +12994,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13518,13 +13518,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14038,13 +14038,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14562,20 +14562,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15093,20 +15093,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15620,12 +15620,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16136,7 +16136,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -16647,7 +16647,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -17166,15 +17166,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17690,13 +17690,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18210,13 +18210,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18734,20 +18734,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19265,20 +19265,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19792,12 +19792,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result
index 07b9770d3ca..3409f1d380e 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result
@@ -75,9 +75,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -534,12 +534,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1004,15 +1004,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1475,13 +1475,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1940,13 +1940,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2411,20 +2411,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2887,20 +2887,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3361,12 +3361,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3825,9 +3825,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4284,12 +4284,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4754,15 +4754,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5225,13 +5225,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5690,13 +5690,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6161,20 +6161,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6637,20 +6637,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7111,12 +7111,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7575,9 +7575,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8034,12 +8034,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8504,15 +8504,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8975,13 +8975,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9440,13 +9440,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9911,20 +9911,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10387,20 +10387,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10861,12 +10861,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11325,9 +11325,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11784,12 +11784,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12254,15 +12254,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12725,13 +12725,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13190,13 +13190,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13661,20 +13661,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14137,20 +14137,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14611,12 +14611,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15075,9 +15075,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15534,12 +15534,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16004,15 +16004,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16475,13 +16475,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16940,13 +16940,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17411,20 +17411,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17887,20 +17887,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18361,12 +18361,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18828,9 +18828,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19287,12 +19287,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19757,15 +19757,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20228,13 +20228,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20693,13 +20693,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21164,20 +21164,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21640,20 +21640,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22114,12 +22114,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22578,9 +22578,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23037,12 +23037,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23507,15 +23507,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23978,13 +23978,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24443,13 +24443,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24914,20 +24914,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25390,20 +25390,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25864,12 +25864,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26328,9 +26328,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26787,12 +26787,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27257,15 +27257,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27728,13 +27728,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28193,13 +28193,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28664,20 +28664,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29140,20 +29140,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29614,12 +29614,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30078,9 +30078,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30537,12 +30537,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31007,15 +31007,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31478,13 +31478,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31943,13 +31943,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32414,20 +32414,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32890,20 +32890,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33364,12 +33364,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33828,9 +33828,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34287,12 +34287,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34757,15 +34757,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35228,13 +35228,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35693,13 +35693,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36164,20 +36164,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36640,20 +36640,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37114,12 +37114,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37582,9 +37582,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38042,12 +38042,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38513,15 +38513,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38985,13 +38985,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39451,13 +39451,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39923,20 +39923,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40400,20 +40400,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40875,12 +40875,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41340,9 +41340,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41800,12 +41800,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42271,15 +42271,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42743,13 +42743,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -43209,13 +43209,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -43681,20 +43681,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -44158,20 +44158,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -44633,12 +44633,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -45097,9 +45097,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -45556,12 +45556,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -46026,15 +46026,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -46497,13 +46497,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -46962,13 +46962,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -47433,20 +47433,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -47909,20 +47909,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -48383,12 +48383,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -48847,9 +48847,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -49306,12 +49306,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -49776,15 +49776,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -50247,13 +50247,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -50712,13 +50712,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -51183,20 +51183,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -51659,20 +51659,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -52133,12 +52133,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -52598,9 +52598,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -53058,12 +53058,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -53529,15 +53529,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54001,13 +54001,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54467,13 +54467,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54939,20 +54939,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -55416,20 +55416,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -55891,12 +55891,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -56356,9 +56356,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -56813,12 +56813,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -57281,15 +57281,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -57750,13 +57750,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -58213,13 +58213,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -58682,20 +58682,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -59156,20 +59156,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -59628,12 +59628,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -60090,9 +60090,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -60547,12 +60547,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -61015,15 +61015,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -61484,13 +61484,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -61947,13 +61947,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -62416,20 +62416,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -62890,20 +62890,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -63362,12 +63362,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -64144,9 +64144,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -64601,12 +64601,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -65069,15 +65069,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -65538,13 +65538,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -66001,13 +66001,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -66470,20 +66470,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -66944,20 +66944,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -67416,12 +67416,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -67883,9 +67883,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -68342,12 +68342,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -68812,15 +68812,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -69283,13 +69283,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -69748,13 +69748,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -70219,20 +70219,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -70695,20 +70695,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -71169,12 +71169,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -71633,9 +71633,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -72092,12 +72092,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -72562,15 +72562,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -73033,13 +73033,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -73498,13 +73498,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -73969,20 +73969,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -74445,20 +74445,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -74919,12 +74919,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -75383,9 +75383,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -75842,12 +75842,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -76312,15 +76312,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -76783,13 +76783,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -77248,13 +77248,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -77719,20 +77719,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -78195,20 +78195,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -78669,12 +78669,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -79133,9 +79133,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -79592,12 +79592,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -80062,15 +80062,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -80533,13 +80533,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -80998,13 +80998,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -81469,20 +81469,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -81945,20 +81945,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -82419,12 +82419,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -82883,9 +82883,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB)
+ PARTITION BY HASH (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -83342,12 +83342,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
-(PARTITION part_1 ENGINE = TokuDB,
- PARTITION part_2 ENGINE = TokuDB,
- PARTITION part_3 ENGINE = TokuDB,
- PARTITION part_4 ENGINE = TokuDB,
- PARTITION part_5 ENGINE = TokuDB)
+ PARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` ENGINE = TokuDB,
+ PARTITION `part_2` ENGINE = TokuDB,
+ PARTITION `part_3` ENGINE = TokuDB,
+ PARTITION `part_4` ENGINE = TokuDB,
+ PARTITION `part_5` ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -83812,15 +83812,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -84283,13 +84283,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_1 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -84748,13 +84748,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION part_1 VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION part_3 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -85219,20 +85219,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part_1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part_2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part_3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part_4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part_1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -85695,20 +85695,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part_1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part_2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part_3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part_4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part_1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part_2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part_3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part_4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -86169,12 +86169,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part_1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part_3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part_3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result
index ca85132d982..fca6cbe169e 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result
@@ -73,7 +73,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 unified filelist
@@ -528,7 +528,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 unified filelist
@@ -991,15 +991,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -1459,13 +1459,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -1921,13 +1921,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -2389,20 +2389,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -2866,20 +2866,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -3337,12 +3337,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -3798,7 +3798,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 unified filelist
@@ -4253,7 +4253,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 unified filelist
@@ -4716,15 +4716,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -5184,13 +5184,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -5646,13 +5646,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -6112,20 +6112,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -6585,20 +6585,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -7056,12 +7056,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -7523,7 +7523,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 unified filelist
@@ -8015,7 +8015,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 unified filelist
@@ -8515,15 +8515,15 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -9020,13 +9020,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -9519,13 +9519,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -10024,20 +10024,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -10538,20 +10538,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -11046,12 +11046,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -11543,7 +11543,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 unified filelist
@@ -12035,7 +12035,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 unified filelist
@@ -12535,15 +12535,15 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -13040,13 +13040,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -13539,13 +13539,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -14044,20 +14044,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -14558,20 +14558,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -15066,12 +15066,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -15563,7 +15563,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 unified filelist
@@ -16071,7 +16071,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 unified filelist
@@ -16587,15 +16587,15 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST (`f_int1` % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -17108,13 +17108,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE (`f_int1`)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -17623,13 +17623,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
-SUBPARTITION BY HASH (f_int1)
+ PARTITION BY RANGE (`f_int1` DIV 2)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -18144,20 +18144,20 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int1)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int1`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -18674,20 +18674,20 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int1 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int1` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -19198,12 +19198,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int1)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -19716,7 +19716,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 unified filelist
@@ -20208,7 +20208,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 unified filelist
@@ -20708,15 +20708,15 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -21213,13 +21213,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -21712,13 +21712,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -22215,20 +22215,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -22725,20 +22725,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -23233,12 +23233,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -23730,7 +23730,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 unified filelist
@@ -24222,7 +24222,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 unified filelist
@@ -24722,15 +24722,15 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -25227,13 +25227,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -25726,13 +25726,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -26229,20 +26229,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -26739,20 +26739,20 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -27247,12 +27247,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -27744,7 +27744,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 unified filelist
@@ -28252,7 +28252,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 unified filelist
@@ -28768,15 +28768,15 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -29289,13 +29289,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -29804,13 +29804,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY HASH (f_int2)
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
@@ -30323,20 +30323,20 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY (f_int2)
-(PARTITION part1 VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+ PARTITION BY RANGE (`f_int1`)
+SUBPARTITION BY KEY (`f_int2`)
+(PARTITION `part1` VALUES LESS THAN (0)
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES LESS THAN (5)
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES LESS THAN (10)
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES LESS THAN (2147483646)
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -30849,20 +30849,20 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
-SUBPARTITION BY HASH (f_int2 + 1)
-(PARTITION part1 VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+ PARTITION BY LIST (abs(`f_int1` % 3))
+SUBPARTITION BY HASH (`f_int2` + 1)
+(PARTITION `part1` VALUES IN (0)
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
+  SUBPARTITION `sp12` ENGINE = TokuDB),
+ PARTITION `part2` VALUES IN (1)
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
+  SUBPARTITION `sp22` ENGINE = TokuDB),
+ PARTITION `part3` VALUES IN (2)
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
+  SUBPARTITION `sp32` ENGINE = TokuDB),
+ PARTITION `part4` VALUES IN (NULL)
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 unified filelist
 t1.frm
@@ -31373,12 +31373,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY (f_int2)
+ PARTITION BY LIST (abs(`f_int1` % 2))
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 unified filelist
 t1.frm
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_tokudb.result
index 5031af92fbe..af3aaddca7c 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_tokudb.result
@@ -28,9 +28,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -56,9 +56,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -87,9 +87,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -117,9 +117,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -148,9 +148,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -178,9 +178,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -209,9 +209,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -239,9 +239,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -270,9 +270,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -300,9 +300,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -331,9 +331,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -361,9 +361,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -392,9 +392,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -422,9 +422,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -453,9 +453,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -483,10 +483,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -515,9 +515,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -543,10 +543,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -575,9 +575,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -603,10 +603,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -636,9 +636,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -661,9 +661,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -691,9 +691,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -717,9 +717,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -749,9 +749,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -774,9 +774,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -804,9 +804,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -830,9 +830,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -862,9 +862,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -887,9 +887,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -917,9 +917,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -943,9 +943,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -975,9 +975,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1000,9 +1000,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1030,9 +1030,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1056,9 +1056,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1088,9 +1088,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1113,9 +1113,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1143,9 +1143,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1169,9 +1169,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1201,9 +1201,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1226,9 +1226,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1256,9 +1256,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1282,9 +1282,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1314,9 +1314,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1339,9 +1339,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1369,9 +1369,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1395,9 +1395,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1427,9 +1427,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1452,10 +1452,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1483,9 +1483,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1509,10 +1509,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1542,9 +1542,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1567,10 +1567,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1598,9 +1598,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1624,10 +1624,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1657,9 +1657,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1682,10 +1682,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1713,9 +1713,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1739,10 +1739,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1773,9 +1773,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1800,9 +1800,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1831,9 +1831,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1860,9 +1860,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1891,9 +1891,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1920,9 +1920,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1951,9 +1951,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1980,8 +1980,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2006,9 +2006,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2035,8 +2035,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2061,9 +2061,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2090,8 +2090,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2116,9 +2116,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2143,8 +2143,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2169,9 +2169,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2196,8 +2196,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2222,9 +2222,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2249,8 +2249,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2276,9 +2276,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2300,9 +2300,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2330,9 +2330,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2355,9 +2355,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2387,9 +2387,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2411,9 +2411,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2441,9 +2441,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2466,9 +2466,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2498,9 +2498,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2522,9 +2522,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2552,9 +2552,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2577,9 +2577,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2609,9 +2609,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2633,8 +2633,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2658,9 +2658,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2683,8 +2683,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2710,9 +2710,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2734,8 +2734,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2759,9 +2759,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2784,8 +2784,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2811,9 +2811,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2835,8 +2835,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2860,9 +2860,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2885,8 +2885,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2912,9 +2912,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2936,8 +2936,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2961,9 +2961,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -2986,8 +2986,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3013,9 +3013,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3037,8 +3037,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3062,9 +3062,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3087,8 +3087,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3114,9 +3114,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3138,8 +3138,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3163,9 +3163,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3188,8 +3188,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3217,9 +3217,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3246,9 +3246,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3277,9 +3277,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3308,9 +3308,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3339,9 +3339,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3370,9 +3370,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3401,9 +3401,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3432,9 +3432,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3463,9 +3463,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3494,9 +3494,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3525,9 +3525,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3556,9 +3556,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3587,9 +3587,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3618,10 +3618,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3650,9 +3650,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3681,10 +3681,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3713,9 +3713,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3742,10 +3742,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3774,9 +3774,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3803,10 +3803,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3835,9 +3835,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3864,10 +3864,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3896,9 +3896,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3925,10 +3925,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3959,9 +3959,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -3985,9 +3985,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4015,9 +4015,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4042,9 +4042,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4074,9 +4074,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4100,9 +4100,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4130,9 +4130,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4157,9 +4157,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4189,9 +4189,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4215,9 +4215,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4245,9 +4245,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4272,9 +4272,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4304,9 +4304,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4330,9 +4330,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4360,9 +4360,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4387,9 +4387,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4419,9 +4419,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4445,9 +4445,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4475,9 +4475,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4502,9 +4502,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4534,9 +4534,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4560,9 +4560,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4590,9 +4590,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4617,9 +4617,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4649,9 +4649,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4675,10 +4675,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4706,9 +4706,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4733,10 +4733,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4766,9 +4766,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4792,10 +4792,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4823,9 +4823,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4850,10 +4850,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4883,9 +4883,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4909,10 +4909,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4940,9 +4940,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -4967,10 +4967,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5000,9 +5000,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5026,10 +5026,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5057,9 +5057,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5084,10 +5084,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5117,9 +5117,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5143,10 +5143,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5174,9 +5174,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5201,10 +5201,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5234,9 +5234,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5260,10 +5260,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5291,9 +5291,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5318,10 +5318,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
- PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
- PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
+ PARTITION BY LIST (`a`)
+(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = TokuDB,
+ PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = TokuDB,
+ PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5372,9 +5372,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5405,9 +5405,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5468,9 +5468,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5501,9 +5501,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5564,9 +5564,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5597,9 +5597,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5660,9 +5660,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5693,9 +5693,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5756,9 +5756,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5789,9 +5789,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5852,9 +5852,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5885,9 +5885,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5948,9 +5948,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -5981,9 +5981,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6044,9 +6044,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6077,9 +6077,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6140,9 +6140,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6173,9 +6173,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 11	Original from partition p1
@@ -6236,9 +6236,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6265,9 +6265,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6328,9 +6328,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6357,9 +6357,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6420,9 +6420,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6449,9 +6449,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6512,9 +6512,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6541,9 +6541,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6604,9 +6604,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6633,9 +6633,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6696,9 +6696,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6725,9 +6725,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6788,9 +6788,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6817,9 +6817,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6880,9 +6880,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6909,9 +6909,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -6972,9 +6972,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -7001,9 +7001,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+ PARTITION BY RANGE (`a`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
 SELECT * FROM t1;
 a	b
 11	Original from partition p1
diff --git a/storage/xtradb/mysql-test/storage_engine/parts/suite.pm b/storage/xtradb/mysql-test/storage_engine/parts/suite.pm
new file mode 100644
index 00000000000..e186a532dcc
--- /dev/null
+++ b/storage/xtradb/mysql-test/storage_engine/parts/suite.pm
@@ -0,0 +1,8 @@
+package My::Suite::SE::XtraDB;
+
+@ISA = qw(My::Suite);
+
+return "Need XtraDB engine";
+
+bless { };
+
diff --git a/storage/xtradb/mysql-test/storage_engine/trx/suite.pm b/storage/xtradb/mysql-test/storage_engine/trx/suite.pm
new file mode 100644
index 00000000000..e186a532dcc
--- /dev/null
+++ b/storage/xtradb/mysql-test/storage_engine/trx/suite.pm
@@ -0,0 +1,8 @@
+package My::Suite::SE::XtraDB;
+
+@ISA = qw(My::Suite);
+
+return "Need XtraDB engine";
+
+bless { };
+