From aa0f7e9bd7818adf7d93c26b1fe29ae6aa2d6e41 Mon Sep 17 00:00:00 2001 From: Sachin Setiya Date: Wed, 31 May 2017 17:53:32 +0530 Subject: [PATCH 001/102] Fix galera_defaults test and check_galera_version.inc script Signed-off-by: Sachin Setiya --- .../suite/galera/r/galera_defaults.result | 7 ++++--- .../suite/galera/t/galera_defaults.test | 4 ++-- .../wsrep/include/check_galera_version.inc | 19 ++++++++----------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_defaults.result b/mysql-test/suite/galera/r/galera_defaults.result index b5b94ad317b..878fe80ff98 100644 --- a/mysql-test/suite/galera/r/galera_defaults.result +++ b/mysql-test/suite/galera/r/galera_defaults.result @@ -1,5 +1,5 @@ -SELECT COUNT(*) = 39 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%'; -COUNT(*) = 39 +SELECT COUNT(*) = 40 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%'; +COUNT(*) = 40 1 SELECT VARIABLE_NAME, VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -25,6 +25,7 @@ WSREP_CONVERT_LOCK_TO_TRX OFF WSREP_DBUG_OPTION WSREP_DEBUG OFF WSREP_DESYNC OFF +WSREP_DIRTY_READS OFF WSREP_DRUPAL_282555_WORKAROUND OFF WSREP_FORCED_BINLOG_FORMAT NONE WSREP_LOAD_DATA_SPLITTING ON @@ -47,7 +48,7 @@ WSREP_SST_DONOR WSREP_SST_DONOR_REJECTS_QUERIES OFF WSREP_SST_METHOD rsync WSREP_SYNC_WAIT 7 -; ; ; cert.log_conflicts = no; debug = no; evs.auto_evict = 0; evs.causal_keepalive_period = PT1S; evs.debug_log_mask = 0x1; evs.delay_margin = PT1S; evs.delayed_keep_period = PT30S; evs.inactive_check_period = PT0.5S; evs.inactive_timeout = PT30S; evs.info_log_mask = 0; evs.install_timeout = PT15S; evs.join_retrans_period = PT1S; evs.keepalive_period = PT1S; evs.max_install_timeouts = 3; evs.send_window = 4; evs.stats_report_period = PT1M; evs.suspect_timeout = PT10S; evs.use_aggregate = true; evs.user_send_window = 2; evs.version = 0; evs.view_forget_timeout = P1D; ; gcache.keep_pages_size = 0; gcache.mem_size = 0; ; gcache.page_size = 128M; gcache.recover = no; gcache.size = 128M; gcomm.thread_prio = ; gcs.fc_debug = 0; gcs.fc_factor = 1.0; gcs.fc_limit = 16; gcs.fc_master_slave = no; gcs.max_packet_size = 64500; gcs.max_throttle = 0.25; ;gcs.recv_q_soft_limit = 0.25; gcs.sync_donor = no; ; gmcast.mcast_addr = ; gmcast.mcast_ttl = 1; gmcast.peer_timeout = PT3S; gmcast.segment = 0; gmcast.time_wait = PT5S; gmcast.version = 0; ; pc.announce_timeout = PT3S; pc.checksum = false; pc.ignore_quorum = false; pc.ignore_sb = false; pc.linger = PT20S; pc.npvo = false; pc.recovery = true; pc.version = 0; pc.wait_prim = true; pc.wait_prim_timeout = PT30S; pc.weight = 1; protonet.backend = asio; protonet.version = 0; repl.causal_read_timeout = PT90S; repl.commit_order = 3; repl.key_format = FLAT8; repl.max_ws_size = 2147483647; repl.proto_max = 7; socket.checksum = 2; socket.recv_buf_size = 212992; +; ; ; cert.log_conflicts = no; debug = no; evs.auto_evict = 0; evs.causal_keepalive_period = PT1S; evs.debug_log_mask = 0x1; evs.delay_margin = PT1S; evs.delayed_keep_period = PT30S; evs.inactive_check_period = PT0.5S; evs.inactive_timeout = PT15S; evs.info_log_mask = 0; evs.install_timeout = PT7.5S; evs.join_retrans_period = PT1S; evs.keepalive_period = PT1S; evs.max_install_timeouts = 3; evs.send_window = 4; evs.stats_report_period = PT1M; evs.suspect_timeout = PT10S; evs.use_aggregate = true; evs.user_send_window = 2; evs.version = 0; evs.view_forget_timeout = P1D; ; gcache.keep_pages_size = 0; gcache.mem_size = 0; ; gcache.page_size = 128M; gcache.recover = no; gcache.size = 10M; gcomm.thread_prio = ; gcs.fc_debug = 0; gcs.fc_factor = 1.0; gcs.fc_limit = 16; gcs.fc_master_slave = no; gcs.max_packet_size = 64500; gcs.max_throttle = 0.25; ; gcs.recv_q_soft_limit = 0.25; gcs.sync_donor = no; ; gmcast.mcast_addr = ; gmcast.mcast_ttl = 1; gmcast.peer_timeout = PT3S; gmcast.segment = 0; gmcast.time_wait = PT5S; gmcast.version = 0; ; pc.announce_timeout = PT3S; pc.checksum = false; pc.ignore_quorum = false; pc.ignore_sb = false; pc.linger = PT20S; pc.npvo = false; pc.recovery = true; pc.version = 0; pc.wait_prim = true; pc.wait_prim_timeout = PT30S; pc.weight = 1; protonet.backend = asio; protonet.version = 0; repl.causal_read_timeout = PT90S; repl.commit_order = 3; repl.key_format = FLAT8; repl.max_ws_size = 2147483647; repl.proto_max = 7; socket.checksum = 2; socket.recv_buf_size = 212992; SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'wsrep_%' AND VARIABLE_NAME != 'wsrep_debug_sync_waiters'; diff --git a/mysql-test/suite/galera/t/galera_defaults.test b/mysql-test/suite/galera/t/galera_defaults.test index 87eddedafe9..cd718ae2bdb 100644 --- a/mysql-test/suite/galera/t/galera_defaults.test +++ b/mysql-test/suite/galera/t/galera_defaults.test @@ -13,13 +13,13 @@ # Make sure that the test is operating on the right version of galera library. --disable_query_log ---let $galera_version=25.3.17 +--let $galera_version=3.20 source ../wsrep/include/check_galera_version.inc; --enable_query_log # Global Variables -SELECT COUNT(*) = 39 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%'; +SELECT COUNT(*) = 40 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%'; SELECT VARIABLE_NAME, VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/wsrep/include/check_galera_version.inc b/mysql-test/suite/wsrep/include/check_galera_version.inc index cb35269249b..e495da8f1ee 100644 --- a/mysql-test/suite/wsrep/include/check_galera_version.inc +++ b/mysql-test/suite/wsrep/include/check_galera_version.inc @@ -2,7 +2,7 @@ # Enable tests to check the galera library version. # # ==== Usage ==== -# --let $galera_version=25.3.6 +# --let $galera_version=3.6 # source include/check_galera_lib_version.inc; # # Parameters: @@ -15,25 +15,22 @@ # Required Version eval SET @GALERA_VERSION='$galera_version'; -SELECT CAST(REGEXP_REPLACE(@GALERA_VERSION,'^(\\d+)\\.(\\d+)\\.(\\d+).*','\\1') AS UNSIGNED) INTO @GALERA_MAJOR_VERSION; -SELECT CAST(REGEXP_REPLACE(@GALERA_VERSION,'^(\\d+)\\.(\\d+)\\.(\\d+).*','\\2') AS UNSIGNED) INTO @GALERA_MID_VERSION; -SELECT CAST(REGEXP_REPLACE(@GALERA_VERSION,'^(\\d+)\\.(\\d+)\\.(\\d+).*','\\3') AS UNSIGNED) INTO @GALERA_MINOR_VERSION; +SELECT CAST(REGEXP_REPLACE(@GALERA_VERSION,'^(\\d+)\\.(\\d+).*','\\1') AS UNSIGNED) INTO @GALERA_MAJOR_VERSION; +SELECT CAST(REGEXP_REPLACE(@GALERA_VERSION,'^(\\d+)\\.(\\d+).*','\\2') AS UNSIGNED) INTO @GALERA_MINOR_VERSION; # Actual SELECT VARIABLE_VALUE INTO @ACTUAL_GALERA_VERSION FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'wsrep_provider_version'; -SELECT CAST(REGEXP_REPLACE(@ACTUAL_GALERA_VERSION,'^(\\d+)\\.(\\d+)\\.(\\d+).*','\\1') AS UNSIGNED) INTO @ACTUAL_GALERA_MAJOR_VERSION; -SELECT CAST(REGEXP_REPLACE(@ACTUAL_GALERA_VERSION,'^(\\d+)\\.(\\d+)\\.(\\d+).*','\\2') AS UNSIGNED) INTO @ACTUAL_GALERA_MID_VERSION; -SELECT CAST(REGEXP_REPLACE(@ACTUAL_GALERA_VERSION,'^(\\d+)\\.(\\d+)\\.(\\d+).*','\\3') AS UNSIGNED) INTO @ACTUAL_GALERA_MINOR_VERSION; +SELECT CAST(REGEXP_REPLACE(@ACTUAL_GALERA_VERSION,'^(\\d+)\\.(\\d+).*','\\1') AS UNSIGNED) INTO @ACTUAL_GALERA_MAJOR_VERSION; +SELECT CAST(REGEXP_REPLACE(@ACTUAL_GALERA_VERSION,'^(\\d+)\\.(\\d+).*','\\2') AS UNSIGNED) INTO @ACTUAL_GALERA_MINOR_VERSION; # For testing -#SELECT @GALERA_MAJOR_VERSION, @GALERA_MID_VERSION, @GALERA_MINOR_VERSION; +#SELECT @GALERA_MAJOR_VERSION, @GALERA_MINOR_VERSION; #SELECT @ACTUAL_GALERA_VERSION; -#SELECT @ACTUAL_GALERA_MAJOR_VERSION, @ACTUAL_GALERA_MID_VERSION, @ACTUAL_GALERA_MINOR_VERSION; +#SELECT @ACTUAL_GALERA_MAJOR_VERSION, @ACTUAL_GALERA_MINOR_VERSION; if (!`SELECT (@ACTUAL_GALERA_MAJOR_VERSION > @GALERA_MAJOR_VERSION) OR - (@ACTUAL_GALERA_MAJOR_VERSION = @GALERA_MAJOR_VERSION AND @ACTUAL_GALERA_MID_VERSION > @GALERA_MID_VERSION) OR - (@ACTUAL_GALERA_MAJOR_VERSION = @GALERA_MAJOR_VERSION AND @ACTUAL_GALERA_MID_VERSION = @GALERA_MID_VERSION AND @ACTUAL_GALERA_MINOR_VERSION >= @GALERA_MINOR_VERSION) + (@ACTUAL_GALERA_MAJOR_VERSION = @GALERA_MAJOR_VERSION AND @ACTUAL_GALERA_MINOR_VERSION >= @GALERA_MINOR_VERSION) `) { skip Test requires Galera library version $galera_version; From 3806a323ce414fb3b425d762b9fbe08403432f2a Mon Sep 17 00:00:00 2001 From: Sachin Setiya Date: Thu, 1 Jun 2017 16:40:57 +0530 Subject: [PATCH 002/102] Fix galera_var_node_address.test --- mysql-test/suite/galera/r/galera_var_node_address.result | 1 + mysql-test/suite/galera/t/galera_var_node_address.test | 1 + 2 files changed, 2 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_var_node_address.result b/mysql-test/suite/galera/r/galera_var_node_address.result index fa88f4b3128..b562883176a 100644 --- a/mysql-test/suite/galera/r/galera_var_node_address.result +++ b/mysql-test/suite/galera/r/galera_var_node_address.result @@ -1,3 +1,4 @@ +call mtr.add_suppression("WSREP: Stray state UUID msg: .* current group state WAIT_STATE_UUID .*"); SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; VARIABLE_VALUE = 4 1 diff --git a/mysql-test/suite/galera/t/galera_var_node_address.test b/mysql-test/suite/galera/t/galera_var_node_address.test index cf118cf9934..c2105823326 100644 --- a/mysql-test/suite/galera/t/galera_var_node_address.test +++ b/mysql-test/suite/galera/t/galera_var_node_address.test @@ -6,6 +6,7 @@ --source include/galera_cluster.inc --source include/have_innodb.inc +call mtr.add_suppression("WSREP: Stray state UUID msg: .* current group state WAIT_STATE_UUID .*"); SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; --connection node_1 From 4f40f87c48a9ee252f797b5d760a6b6f07cc3815 Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Fri, 2 Jun 2017 11:33:35 -0400 Subject: [PATCH 003/102] bump the VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 22d7ed0a903..ab62b5a1c7c 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ MYSQL_VERSION_MAJOR=10 MYSQL_VERSION_MINOR=0 -MYSQL_VERSION_PATCH=31 +MYSQL_VERSION_PATCH=32 From c258ca2463947fcc3d69bb50a8b5cf6906778508 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Wed, 7 Jun 2017 12:45:09 -0700 Subject: [PATCH 004/102] Fixed the bug mdev-12838. If the optimizer chose an execution plan where a semi-join nest were materialized and the result of materialization was scanned to access other tables by ref access it could build a key over columns of the tables from the nest that were actually inaccessible. The patch performs a proper check whether a key that uses columns of the tables from a materialized semi-join nest can be employed to access outer tables. --- mysql-test/r/subselect_mat.result | 88 ++++++++++++ mysql-test/r/subselect_sj_mat.result | 88 ++++++++++++ mysql-test/t/subselect_sj_mat.test | 207 +++++++++++++++++++++++++++ sql/opt_subselect.cc | 4 + sql/sql_select.cc | 71 ++++++++- sql/sql_select.h | 8 ++ 6 files changed, 461 insertions(+), 5 deletions(-) diff --git a/mysql-test/r/subselect_mat.result b/mysql-test/r/subselect_mat.result index ffa37b025eb..d4dc519227b 100644 --- a/mysql-test/r/subselect_mat.result +++ b/mysql-test/r/subselect_mat.result @@ -2272,6 +2272,94 @@ pk f1 sq 5 3 5 set optimizer_switch= @save_optimizer_switch; DROP TABLE t1,t2; +# +# mdev-12838: scan of materialized of semi-join subquery in join +# +set @save_optimizer_switch=@@optimizer_switch; +CREATE TABLE t1 ( +dispatch_group varchar(32), +assignment_group varchar(32), +sys_id char(32), +PRIMARY KEY (sys_id), +KEY idx1 (dispatch_group), +KEY idx2 (assignment_group) +) ENGINE=MyISAM; +CREATE TABLE t2 ( +ugroup varchar(32), +user varchar(32), +sys_id char(32), +PRIMARY KEY (sys_id), +KEY idx3 (ugroup), +KEY idx4 (user) +) ENGINE=MyISAM; +CREATE TABLE t3 ( +type mediumtext, +sys_id char(32), +PRIMARY KEY (sys_id) +) ENGINE=MyISAM; +set optimizer_switch='materialization=off'; +explain SELECT t1.assignment_group +FROM t1, t3 +WHERE t1.assignment_group = t3.sys_id AND +t1.dispatch_group IN +(SELECT t2.ugroup +FROM t2, t3 t3_i +WHERE t2.ugroup = t3_i.sys_id AND +t3_i.type LIKE '59e22fb137032000158bbfc8bcbe5d52' AND +t2.user = '86826bf03710200044e0bfc8bcbe5d79'); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t2 ref idx3,idx4 idx4 35 const 2 Using index condition; Using where; Start temporary +1 PRIMARY t3_i eq_ref PRIMARY PRIMARY 32 test.t2.ugroup 1 Using index condition; Using where +1 PRIMARY t1 ref idx1,idx2 idx1 35 test.t3_i.sys_id 2 Using index condition; Using where; End temporary +1 PRIMARY t3 eq_ref PRIMARY PRIMARY 32 test.t1.assignment_group 1 Using where; Using index +SELECT t1.assignment_group +FROM t1, t3 +WHERE t1.assignment_group = t3.sys_id AND +t1.dispatch_group IN +(SELECT t2.ugroup +FROM t2, t3 t3_i +WHERE t2.ugroup = t3_i.sys_id AND +t3_i.type LIKE '59e22fb137032000158bbfc8bcbe5d52' AND +t2.user = '86826bf03710200044e0bfc8bcbe5d79'); +assignment_group +df50316637232000158bbfc8bcbe5d23 +e08fad2637232000158bbfc8bcbe5d39 +ec70316637232000158bbfc8bcbe5d60 +7b10fd2637232000158bbfc8bcbe5d30 +ebb4620037332000158bbfc8bcbe5d89 +set optimizer_switch='materialization=on'; +explain SELECT t1.assignment_group +FROM t1, t3 +WHERE t1.assignment_group = t3.sys_id AND +t1.dispatch_group IN +(SELECT t2.ugroup +FROM t2, t3 t3_i +WHERE t2.ugroup = t3_i.sys_id AND +t3_i.type LIKE '59e22fb137032000158bbfc8bcbe5d52' AND +t2.user = '86826bf03710200044e0bfc8bcbe5d79'); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY ALL distinct_key NULL NULL NULL 2 +1 PRIMARY t1 ref idx1,idx2 idx1 35 test.t2.ugroup 2 Using where +1 PRIMARY t3 eq_ref PRIMARY PRIMARY 32 test.t1.assignment_group 1 Using where; Using index +2 MATERIALIZED t2 ref idx3,idx4 idx4 35 const 2 Using index condition; Using where +2 MATERIALIZED t3_i eq_ref PRIMARY PRIMARY 32 test.t2.ugroup 1 Using index condition; Using where +SELECT t1.assignment_group +FROM t1, t3 +WHERE t1.assignment_group = t3.sys_id AND +t1.dispatch_group IN +(SELECT t2.ugroup +FROM t2, t3 t3_i +WHERE t2.ugroup = t3_i.sys_id AND +t3_i.type LIKE '59e22fb137032000158bbfc8bcbe5d52' AND +t2.user = '86826bf03710200044e0bfc8bcbe5d79'); +assignment_group +df50316637232000158bbfc8bcbe5d23 +e08fad2637232000158bbfc8bcbe5d39 +ec70316637232000158bbfc8bcbe5d60 +7b10fd2637232000158bbfc8bcbe5d30 +ebb4620037332000158bbfc8bcbe5d89 +DROP TABLE t1,t2,t3; +set optimizer_switch=@save_optimizer_switch; # End of 5.5 tests set @subselect_mat_test_optimizer_switch_value=null; set @@optimizer_switch='materialization=on,in_to_exists=off,semijoin=off'; diff --git a/mysql-test/r/subselect_sj_mat.result b/mysql-test/r/subselect_sj_mat.result index 47f578fb589..cb5012a91c9 100644 --- a/mysql-test/r/subselect_sj_mat.result +++ b/mysql-test/r/subselect_sj_mat.result @@ -2312,4 +2312,92 @@ pk f1 sq 5 3 5 set optimizer_switch= @save_optimizer_switch; DROP TABLE t1,t2; +# +# mdev-12838: scan of materialized of semi-join subquery in join +# +set @save_optimizer_switch=@@optimizer_switch; +CREATE TABLE t1 ( +dispatch_group varchar(32), +assignment_group varchar(32), +sys_id char(32), +PRIMARY KEY (sys_id), +KEY idx1 (dispatch_group), +KEY idx2 (assignment_group) +) ENGINE=MyISAM; +CREATE TABLE t2 ( +ugroup varchar(32), +user varchar(32), +sys_id char(32), +PRIMARY KEY (sys_id), +KEY idx3 (ugroup), +KEY idx4 (user) +) ENGINE=MyISAM; +CREATE TABLE t3 ( +type mediumtext, +sys_id char(32), +PRIMARY KEY (sys_id) +) ENGINE=MyISAM; +set optimizer_switch='materialization=off'; +explain SELECT t1.assignment_group +FROM t1, t3 +WHERE t1.assignment_group = t3.sys_id AND +t1.dispatch_group IN +(SELECT t2.ugroup +FROM t2, t3 t3_i +WHERE t2.ugroup = t3_i.sys_id AND +t3_i.type LIKE '59e22fb137032000158bbfc8bcbe5d52' AND +t2.user = '86826bf03710200044e0bfc8bcbe5d79'); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t2 ref idx3,idx4 idx4 35 const 2 Using index condition; Using where; Start temporary +1 PRIMARY t3_i eq_ref PRIMARY PRIMARY 32 test.t2.ugroup 1 Using index condition; Using where +1 PRIMARY t1 ref idx1,idx2 idx1 35 test.t3_i.sys_id 2 Using index condition; Using where; End temporary +1 PRIMARY t3 eq_ref PRIMARY PRIMARY 32 test.t1.assignment_group 1 Using where; Using index +SELECT t1.assignment_group +FROM t1, t3 +WHERE t1.assignment_group = t3.sys_id AND +t1.dispatch_group IN +(SELECT t2.ugroup +FROM t2, t3 t3_i +WHERE t2.ugroup = t3_i.sys_id AND +t3_i.type LIKE '59e22fb137032000158bbfc8bcbe5d52' AND +t2.user = '86826bf03710200044e0bfc8bcbe5d79'); +assignment_group +df50316637232000158bbfc8bcbe5d23 +e08fad2637232000158bbfc8bcbe5d39 +ec70316637232000158bbfc8bcbe5d60 +7b10fd2637232000158bbfc8bcbe5d30 +ebb4620037332000158bbfc8bcbe5d89 +set optimizer_switch='materialization=on'; +explain SELECT t1.assignment_group +FROM t1, t3 +WHERE t1.assignment_group = t3.sys_id AND +t1.dispatch_group IN +(SELECT t2.ugroup +FROM t2, t3 t3_i +WHERE t2.ugroup = t3_i.sys_id AND +t3_i.type LIKE '59e22fb137032000158bbfc8bcbe5d52' AND +t2.user = '86826bf03710200044e0bfc8bcbe5d79'); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY ALL distinct_key NULL NULL NULL 2 +1 PRIMARY t1 ref idx1,idx2 idx1 35 test.t2.ugroup 2 Using where +1 PRIMARY t3 eq_ref PRIMARY PRIMARY 32 test.t1.assignment_group 1 Using where; Using index +2 MATERIALIZED t2 ref idx3,idx4 idx4 35 const 2 Using index condition; Using where +2 MATERIALIZED t3_i eq_ref PRIMARY PRIMARY 32 test.t2.ugroup 1 Using index condition; Using where +SELECT t1.assignment_group +FROM t1, t3 +WHERE t1.assignment_group = t3.sys_id AND +t1.dispatch_group IN +(SELECT t2.ugroup +FROM t2, t3 t3_i +WHERE t2.ugroup = t3_i.sys_id AND +t3_i.type LIKE '59e22fb137032000158bbfc8bcbe5d52' AND +t2.user = '86826bf03710200044e0bfc8bcbe5d79'); +assignment_group +df50316637232000158bbfc8bcbe5d23 +e08fad2637232000158bbfc8bcbe5d39 +ec70316637232000158bbfc8bcbe5d60 +7b10fd2637232000158bbfc8bcbe5d30 +ebb4620037332000158bbfc8bcbe5d89 +DROP TABLE t1,t2,t3; +set optimizer_switch=@save_optimizer_switch; # End of 5.5 tests diff --git a/mysql-test/t/subselect_sj_mat.test b/mysql-test/t/subselect_sj_mat.test index cd71ae5c901..90f63bea561 100644 --- a/mysql-test/t/subselect_sj_mat.test +++ b/mysql-test/t/subselect_sj_mat.test @@ -1944,4 +1944,211 @@ set optimizer_switch= @save_optimizer_switch; DROP TABLE t1,t2; +--echo # +--echo # mdev-12838: scan of materialized of semi-join subquery in join +--echo # + +set @save_optimizer_switch=@@optimizer_switch; + +CREATE TABLE t1 ( + dispatch_group varchar(32), + assignment_group varchar(32), + sys_id char(32), + PRIMARY KEY (sys_id), + KEY idx1 (dispatch_group), + KEY idx2 (assignment_group) +) ENGINE=MyISAM; + +CREATE TABLE t2 ( + ugroup varchar(32), + user varchar(32), + sys_id char(32), + PRIMARY KEY (sys_id), + KEY idx3 (ugroup), + KEY idx4 (user) +) ENGINE=MyISAM; + +CREATE TABLE t3 ( + type mediumtext, + sys_id char(32), + PRIMARY KEY (sys_id) +) ENGINE=MyISAM; + +--disable_query_log + +INSERT INTO t1 VALUES +('e5d9f63237232000158bbfc8bcbe5dbf','f304ae0037332000158bbfc8bcbe5d4f', +'5398c0e037003000158bbfc8bcbe5dbb'), +('69d9f63237232000158bbfc8bcbe5dcb','7172ea0037332000158bbfc8bcbe5db6', +'5c188ca037003000158bbfc8bcbe5dbc'), +('577ed708d773020058c92cf65e61037a','699708d4d773020058c92cf65e61037c', +'623a8cd4d773020058c92cf65e6103ea'), +('96fb652637232000158bbfc8bcbe5db4','df50316637232000158bbfc8bcbe5d23', +'6835bd6637232000158bbfc8bcbe5d21'), +('e1d9f63237232000158bbfc8bcbe5db8','96346e0037332000158bbfc8bcbe5daa', +'697880e037003000158bbfc8bcbe5dcd'), +('25d9f63237232000158bbfc8bcbe5dbe','f304ae0037332000158bbfc8bcbe5d4f', +'6a9804e037003000158bbfc8bcbe5d09'), +('96fb652637232000158bbfc8bcbe5db4','e08fad2637232000158bbfc8bcbe5d39', +'6d25f96637232000158bbfc8bcbe5d79'), +('e9d9f63237232000158bbfc8bcbe5dc6','7172ea0037332000158bbfc8bcbe5db6', +'702880e037003000158bbfc8bcbe5d94'), +('a5d9f63237232000158bbfc8bcbe5dca','f304ae0037332000158bbfc8bcbe5d4f', +'7188c0e037003000158bbfc8bcbe5d75'), +('65d9f63237232000158bbfc8bcbe5dc4','f304ae0037332000158bbfc8bcbe5d4f', +'778880e037003000158bbfc8bcbe5d9e'), +('a1d9f63237232000158bbfc8bcbe5dc3','7172ea0037332000158bbfc8bcbe5db6', +'7d0840e037003000158bbfc8bcbe5dde'), +('21d9f63237232000158bbfc8bcbe5db7','96346e0037332000158bbfc8bcbe5daa', +'7f6880e037003000158bbfc8bcbe5da7'), +('96fb652637232000158bbfc8bcbe5db4','ec70316637232000158bbfc8bcbe5d60', +'8025f96637232000158bbfc8bcbe5dd0'), +('3dd9f63237232000158bbfc8bcbe5dcc','7172ea0037332000158bbfc8bcbe5db6', +'823880e037003000158bbfc8bcbe5ded'), +('96fb652637232000158bbfc8bcbe5db4','7b10fd2637232000158bbfc8bcbe5d30', +'9a353d6637232000158bbfc8bcbe5dee'), +('75d9f63237232000158bbfc8bcbe5dd0','ebb4620037332000158bbfc8bcbe5d89', +'a558c0e037003000158bbfc8bcbe5d36'), +('6dd9f63237232000158bbfc8bcbe5db5','96346e0037332000158bbfc8bcbe5daa', +'bc78cca037003000158bbfc8bcbe5d74'), +('add9f63237232000158bbfc8bcbe5dc7','7172ea0037332000158bbfc8bcbe5db6', +'c53804a037003000158bbfc8bcbe5db8'), +('fdd9f63237232000158bbfc8bcbe5dcd','7864ae0037332000158bbfc8bcbe5db8', +'cfe740e037003000158bbfc8bcbe5de8'), +('96fb652637232000158bbfc8bcbe5db4','3120fd2637232000158bbfc8bcbe5d42', +'e2257d6637232000158bbfc8bcbe5ded'), +('3c3725e237232000158bbfc8bcbe5da1','96346e0037332000158bbfc8bcbe5daa', +'ee78c0e037003000158bbfc8bcbe5db5'), +('a9d9f63237232000158bbfc8bcbe5dc0','7172ea0037332000158bbfc8bcbe5db6', +'f00888a037003000158bbfc8bcbe5dd3'), +('29d9f63237232000158bbfc8bcbe5db9','7172ea0037332000158bbfc8bcbe5db6', +'fa0880e037003000158bbfc8bcbe5d70'), +('b1d9f63237232000158bbfc8bcbe5dcf','ebb4620037332000158bbfc8bcbe5d89', +'fa48c0e037003000158bbfc8bcbe5d28'); + +INSERT INTO t2 VALUES +('17801ac21b13200050fdfbcd2c0713e8','8e826bf03710200044e0bfc8bcbe5d86', +'14c19a061b13200050fdfbcd2c07134b'), +('577ed708d773020058c92cf65e61037a','931644d4d773020058c92cf65e61034c', +'339888d4d773020058c92cf65e6103aa'), +('df50316637232000158bbfc8bcbe5d23','92826bf03710200044e0bfc8bcbe5da9', +'3682f56637232000158bbfc8bcbe5d44'), +('b4f342b237232000158bbfc8bcbe5def','86826bf03710200044e0bfc8bcbe5d70', +'38e4c2b237232000158bbfc8bcbe5dea'), +('7b10fd2637232000158bbfc8bcbe5d30','8a826bf03710200044e0bfc8bcbe5d72', +'4442b56637232000158bbfc8bcbe5d43'), +('3120fd2637232000158bbfc8bcbe5d42','82826bf03710200044e0bfc8bcbe5d89', +'49d2396637232000158bbfc8bcbe5d12'), +('96fb652637232000158bbfc8bcbe5db4','86826bf03710200044e0bfc8bcbe5d79', +'4e3ca52637232000158bbfc8bcbe5d3e'), +('17801ac21b13200050fdfbcd2c0713e8','824fd523bf4320007a6d257b3f073963', +'58c19a061b13200050fdfbcd2c07134e'), +('699708d4d773020058c92cf65e61037c','901784d4d773020058c92cf65e6103da', +'5bc708d4d773020058c92cf65e6103d5'), +('75d9f63237232000158bbfc8bcbe5dd0','86826bf03710200044e0bfc8bcbe5d79', +'6b52cb7237232000158bbfc8bcbe5ded'), +('f253da061b13200050fdfbcd2c0713ab','8e826bf03710200044e0bfc8bcbe5d86', +'81045e061b13200050fdfbcd2c071373'), +('7b10fd2637232000158bbfc8bcbe5d30','8e826bf03710200044e0bfc8bcbe5d74', +'8c42b56637232000158bbfc8bcbe5d3f'), +('e5d9f63237232000158bbfc8bcbe5dbf','7a826bf03710200044e0bfc8bcbe5df5', +'a7acfe3237232000158bbfc8bcbe5d78'), +('8a5055c9c61122780043563ef53438e3','9ee1b13dc6112271007f9d0efdb69cd0', +'a9aff553c6112276015a8006174bee21'), +('8a4dde73c6112278017a6a4baf547aa7','9ee1b13dc6112271007f9d0efdb69cd0', +'a9b2f526c61122760003ae07349d294f'), +('aaccc971c0a8001500fe1ff4302de101','9ee1b13dc6112271007f9d0efdb69cd0', +'aacceed3c0a80015009069bba51c4e21'), +('65d9f63237232000158bbfc8bcbe5dc4','8d56406a0a0a0a6b004070b354aada28', +'ac1bfa3237232000158bbfc8bcbe5dc3'), +('b85d44954a3623120004689b2d5dd60a','97000fcc0a0a0a6e0104ca999f619e5b', +'b77bc032cbb00200d71cb9c0c24c9c45'), +('220f8e71c61122840197e57c33464f70','8d56406a0a0a0a6b004070b354aada28', +'b9b74f080a0a0b343ba75b95bdb27056'), +('e08fad2637232000158bbfc8bcbe5d39','82826bf03710200044e0bfc8bcbe5d80', +'be02756637232000158bbfc8bcbe5d8b'), +('ebb4620037332000158bbfc8bcbe5d89','7682abf03710200044e0bfc8bcbe5d25', +'c0122f4437732000158bbfc8bcbe5d7d'), +('96fb652637232000158bbfc8bcbe5db4','7a82abf03710200044e0bfc8bcbe5d27', +'c23ca52637232000158bbfc8bcbe5d3b'), +('22122b37c611228400f9ff91c857581d','9ee1b13dc6112271007f9d0efdb69cd0', +'d23bbf5dac14641866947512bde59dc5'), +('db53a9290a0a0a650091abebccf833c6','9ee1b13dc6112271007f9d0efdb69cd0', +'db54a0f60a0a0a65002c54dcb72b4f41'), +('e08fad2637232000158bbfc8bcbe5d39','8e826bf03710200044e0bfc8bcbe5d86', +'f602756637232000158bbfc8bcbe5d88'), +('699708d4d773020058c92cf65e61037c','8d59d601d7b3020058c92cf65e6103c2', +'f718a241d7b3020058c92cf65e610332'), +('df50316637232000158bbfc8bcbe5d23','9e826bf03710200044e0bfc8bcbe5da6', +'fe82f56637232000158bbfc8bcbe5d4e'), +('f972d6061b13200050fdfbcd2c0713e5','780395f0df031100a9e78b6c3df2631f', +'ff4395f0df031100a9e78b6c3df2637e'); + +INSERT INTO t3 VALUES +('87245e061b13200050fdfbcd2c0713cc','7172ea0037332000158bbfc8bcbe5db6'), +('74af88c6c611227d0066386e74dc853d','74ad1ff3c611227d01d25feac2af603f'), +('59e22fb137032000158bbfc8bcbe5d52','75d9f63237232000158bbfc8bcbe5dd0'), +('98906fb137032000158bbfc8bcbe5d65','781da52637232000158bbfc8bcbe5db8'), +('87245e061b13200050fdfbcd2c0713cc','7864ae0037332000158bbfc8bcbe5db8'), +('87245e061b13200050fdfbcd2c0713cc','7b10fd2637232000158bbfc8bcbe5d30'), +('59e22fb137032000158bbfc8bcbe5d52','81a880e037003000158bbfc8bcbe5df8'), +('74af88c6c611227d0066386e74dc853d','8a4cb6d4c61122780043b1642efcd52b'), +('1cb8ab9bff500200158bffffffffff62','8a4dde73c6112278017a6a4baf547aa7'), +('1cb8ab9bff500200158bffffffffff62','8a5055c9c61122780043563ef53438e3'), +('87245e061b13200050fdfbcd2c0713cc','96346e0037332000158bbfc8bcbe5daa'), +('59e22fb137032000158bbfc8bcbe5d52','96fb652637232000158bbfc8bcbe5db4'), +('59e22fb137032000158bbfc8bcbe5d52','a1d9f63237232000158bbfc8bcbe5dc3'), +('59e22fb137032000158bbfc8bcbe5d52','a5d9f63237232000158bbfc8bcbe5dca'), +('1cb8ab9bff500200158bffffffffff62','a715cd759f2002002920bde8132e7018'), +('59e22fb137032000158bbfc8bcbe5d52','a9d9f63237232000158bbfc8bcbe5dc0'), +('74af88c6c611227d0066386e74dc853d','aacb62e2c0a80015007f67f752c2b12c'), +('74af88c6c611227d0066386e74dc853d','aaccc971c0a8001500fe1ff4302de101'), +('59e22fb137032000158bbfc8bcbe5d52','add9f63237232000158bbfc8bcbe5dbb'), +('59e22fb137032000158bbfc8bcbe5d52','add9f63237232000158bbfc8bcbe5dc7'), +('59e22fb137032000158bbfc8bcbe5d52','b1d9f63237232000158bbfc8bcbe5dcf'), +('1cb8ab9bff500200158bffffffffff62','b85d44954a3623120004689b2d5dd60a'), +('1cb8ab9bff500200158bffffffffff62','b97e89b94a36231201676b73322a0311'), +('1cb8ab9bff500200158bffffffffff62','cfcbad03d711110050f5edcb9e61038f'), +('1cb8ab9bff500200158bffffffffff62','d625dccec0a8016700a222a0f7900d06'), +('1cb8ab9bff500200158bffffffffff62','db53580b0a0a0a6501aa37c294a2ba6b'), +('1cb8ab9bff500200158bffffffffff62','db53a9290a0a0a650091abebccf833c6'), +('1cb8ab9bff500200158bffffffffff62','dc0db135c332010016194ffe5bba8f23'), +('87245e061b13200050fdfbcd2c0713cc','df50316637232000158bbfc8bcbe5d23'), +('87245e061b13200050fdfbcd2c0713cc','e08fad2637232000158bbfc8bcbe5d39'), +('59e22fb137032000158bbfc8bcbe5d52','e1d9f63237232000158bbfc8bcbe5db8'), +('59e22fb137032000158bbfc8bcbe5d52','e5d9f63237232000158bbfc8bcbe5db4'), +('59e22fb137032000158bbfc8bcbe5d52','e5d9f63237232000158bbfc8bcbe5dbf'), +('59e22fb137032000158bbfc8bcbe5d52','e9d9f63237232000158bbfc8bcbe5dba'), +('59e22fb137032000158bbfc8bcbe5d52','e9d9f63237232000158bbfc8bcbe5dc6'), +('87245e061b13200050fdfbcd2c0713cc','ebb4620037332000158bbfc8bcbe5d89'), +('87245e061b13200050fdfbcd2c0713cc','ec70316637232000158bbfc8bcbe5d60'), +('87245e061b13200050fdfbcd2c0713cc','f253da061b13200050fdfbcd2c0713ab'), +('87245e061b13200050fdfbcd2c0713cc','f304ae0037332000158bbfc8bcbe5d4f'), +('98906fb137032000158bbfc8bcbe5d65','f972d6061b13200050fdfbcd2c0713e5'), +('59e22fb137032000158bbfc8bcbe5d52','fdd9f63237232000158bbfc8bcbe5dcd'); + +--enable_query_log + +let $q= +SELECT t1.assignment_group +FROM t1, t3 +WHERE t1.assignment_group = t3.sys_id AND + t1.dispatch_group IN + (SELECT t2.ugroup + FROM t2, t3 t3_i + WHERE t2.ugroup = t3_i.sys_id AND + t3_i.type LIKE '59e22fb137032000158bbfc8bcbe5d52' AND + t2.user = '86826bf03710200044e0bfc8bcbe5d79'); + +set optimizer_switch='materialization=off'; +eval explain $q; +eval $q; + +set optimizer_switch='materialization=on'; +eval explain $q; +eval $q; + +DROP TABLE t1,t2,t3; +set optimizer_switch=@save_optimizer_switch; + --echo # End of 5.5 tests diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index d8b4de29f47..af1abb2001e 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -3429,6 +3429,7 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join) table_map remaining_tables= 0; table_map handled_tabs= 0; join->sjm_lookup_tables= 0; + join->sjm_scan_tables= 0; for (tablenr= table_count - 1 ; tablenr != join->const_tables - 1; tablenr--) { POSITION *pos= join->best_positions + tablenr; @@ -3487,6 +3488,9 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join) for (i= tablenr; i != (first + sjm->tables - 1); i--) rem_tables |= join->best_positions[i].table->table->map; + for (i= first; i < first+ sjm->tables; i++) + join->sjm_scan_tables |= join->best_positions[i].table->table->map; + POSITION dummy; join->cur_sj_inner_tables= 0; for (i= first + sjm->tables; i <= tablenr; i++) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index bad57aeac87..86ba0346366 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7361,6 +7361,63 @@ bool JOIN_TAB::hash_join_is_possible() } +/** + @brief + Check whether a KEYUSE can be really used for access this join table + + @param join Join structure with the best join order + for which the check is performed + @param keyuse Evaluated KEYUSE structure + + @details + This function is supposed to be used after the best execution plan have been + already chosen and the JOIN_TAB array for the best join order been already set. + For a given KEYUSE to access this JOIN_TAB in the best execution plan the + function checks whether it really can be used. The function first performs + the check with access_from_tables_is_allowed(). If it succeeds it checks + whether the keyuse->val does not use some fields of a materialized semijoin + nest that cannot be used to build keys to access outer tables. + Such KEYUSEs exists for the query like this: + select * from ot + where ot.c in (select it1.c from it1, it2 where it1.c=f(it2.c)) + Here we have two KEYUSEs to access table ot: with val=it1.c and val=f(it2.c). + However if the subquery was materialized the second KEYUSE cannot be employed + to access ot. + + @retval true the given keyuse can be used for ref access of this JOIN_TAB + @retval false otherwise +*/ + +bool JOIN_TAB::keyuse_is_valid_for_access_in_chosen_plan(JOIN *join, + KEYUSE *keyuse) +{ + if (!access_from_tables_is_allowed(keyuse->used_tables, + join->sjm_lookup_tables)) + return false; + if (join->sjm_scan_tables & table->map) + return true; + table_map keyuse_sjm_scan_tables= keyuse->used_tables & + join->sjm_scan_tables; + if (!keyuse_sjm_scan_tables) + return true; + uint sjm_tab_nr= 0; + while (!(keyuse_sjm_scan_tables & table_map(1) << sjm_tab_nr)) + sjm_tab_nr++; + JOIN_TAB *sjm_tab= join->map2table[sjm_tab_nr]; + TABLE_LIST *emb_sj_nest= sjm_tab->emb_sj_nest; + if (!(emb_sj_nest->sj_mat_info && emb_sj_nest->sj_mat_info->is_used && + emb_sj_nest->sj_mat_info->is_sj_scan)) + return true; + st_select_lex *sjm_sel= emb_sj_nest->sj_subq_pred->unit->first_select(); + for (uint i= 0; i < sjm_sel->item_list.elements; i++) + { + if (sjm_sel->ref_pointer_array[i] == keyuse->val) + return true; + } + return false; +} + + static uint cache_record_length(JOIN *join,uint idx) { @@ -7904,6 +7961,7 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab, do { if (!(~used_tables & keyuse->used_tables) && + join_tab->keyuse_is_valid_for_access_in_chosen_plan(join, keyuse) && are_tables_local(join_tab, keyuse->used_tables)) { if (first_keyuse) @@ -7918,6 +7976,8 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab, { if (curr->keypart == keyuse->keypart && !(~used_tables & curr->used_tables) && + join_tab->keyuse_is_valid_for_access_in_chosen_plan(join, + keyuse) && are_tables_local(join_tab, curr->used_tables)) break; } @@ -7951,6 +8011,7 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab, do { if (!(~used_tables & keyuse->used_tables) && + join_tab->keyuse_is_valid_for_access_in_chosen_plan(join, keyuse) && are_tables_local(join_tab, keyuse->used_tables)) { bool add_key_part= TRUE; @@ -7960,7 +8021,9 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab, { if (curr->keypart == keyuse->keypart && !(~used_tables & curr->used_tables) && - are_tables_local(join_tab, curr->used_tables)) + join_tab->keyuse_is_valid_for_access_in_chosen_plan(join, + curr) && + are_tables_local(join_tab, curr->used_tables)) { keyuse->keypart= NO_KEYPART; add_key_part= FALSE; @@ -8062,8 +8125,7 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j, do { if (!(~used_tables & keyuse->used_tables) && - j->access_from_tables_is_allowed(keyuse->used_tables, - join->sjm_lookup_tables)) + j->keyuse_is_valid_for_access_in_chosen_plan(join, keyuse)) { if (are_tables_local(j, keyuse->val->used_tables())) { @@ -8132,8 +8194,7 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j, for (i=0 ; i < keyparts ; keyuse++,i++) { while (((~used_tables) & keyuse->used_tables) || - !j->access_from_tables_is_allowed(keyuse->used_tables, - join->sjm_lookup_tables) || + !j->keyuse_is_valid_for_access_in_chosen_plan(join, keyuse) || keyuse->keypart == NO_KEYPART || (keyuse->keypart != (is_hash_join_key_no(key) ? diff --git a/sql/sql_select.h b/sql/sql_select.h index 0623672840e..1bc1e4c2b7a 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -540,6 +540,8 @@ typedef struct st_join_table { !(used_sjm_lookup_tables & ~emb_sj_nest->sj_inner_tables)); } + bool keyuse_is_valid_for_access_in_chosen_plan(JOIN *join, KEYUSE *keyuse); + } JOIN_TAB; @@ -1003,6 +1005,11 @@ public: to materialize and access by lookups */ table_map sjm_lookup_tables; + /** + Bitmap of semijoin tables that the chosen plan decided + to materialize to scan the results of materialization + */ + table_map sjm_scan_tables; /* Constant tables for which we have found a row (as opposed to those for which we didn't). @@ -1331,6 +1338,7 @@ public: pre_sort_join_tab= NULL; emb_sjm_nest= NULL; sjm_lookup_tables= 0; + sjm_scan_tables= 0; /* The following is needed because JOIN::cleanup(true) may be called for joins for which JOIN::optimize was aborted with an error before a proper From 151f4e9b4adea020fbe19b640016845dfa65d820 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Wed, 7 Jun 2017 16:29:55 -0700 Subject: [PATCH 005/102] Fixed the bug mdev-12963. This patch corrects the fix for bug mdev-7599. When the min/max optimization of the function opt_sum_query() optimizes away all tables of a subquery it should not ever be rolled back. --- mysql-test/r/subselect_mat_cost_bugs.result | 17 +++++++++++++++++ mysql-test/t/subselect_mat_cost_bugs.test | 16 ++++++++++++++++ sql/sql_select.cc | 1 + 3 files changed, 34 insertions(+) diff --git a/mysql-test/r/subselect_mat_cost_bugs.result b/mysql-test/r/subselect_mat_cost_bugs.result index dba4d049da3..57b0526c6a3 100644 --- a/mysql-test/r/subselect_mat_cost_bugs.result +++ b/mysql-test/r/subselect_mat_cost_bugs.result @@ -485,3 +485,20 @@ FROM t2 AS t2a INNER JOIN t2 t2b INNER JOIN t3 ON (f3 = t2b.f2) ); f1 DROP TABLE t1,t2,t3; +# +# MDEV-12963: min/max optimization optimizing away all tables employed +# for uncorrelated IN subquery used in a disjunct of WHERE +# +create table t1 (a int, index idx(a)) engine=myisam; +insert into t1 values (4),(7),(1),(3),(9); +select * from t1 where a in (select max(a) from t1 where a < 4) or a > 5; +a +3 +7 +9 +explain +select * from t1 where a in (select max(a) from t1 where a < 4) or a > 5; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t1 index idx idx 5 NULL 5 Using where; Using index +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Select tables optimized away +drop table t1; diff --git a/mysql-test/t/subselect_mat_cost_bugs.test b/mysql-test/t/subselect_mat_cost_bugs.test index 9e3ac603ec6..35f2b9588fe 100644 --- a/mysql-test/t/subselect_mat_cost_bugs.test +++ b/mysql-test/t/subselect_mat_cost_bugs.test @@ -507,3 +507,19 @@ SELECT * FROM t1 ON (f3 = t2b.f2) ); DROP TABLE t1,t2,t3; + +--echo # +--echo # MDEV-12963: min/max optimization optimizing away all tables employed +--echo # for uncorrelated IN subquery used in a disjunct of WHERE +--echo # + +create table t1 (a int, index idx(a)) engine=myisam; +insert into t1 values (4),(7),(1),(3),(9); + +select * from t1 where a in (select max(a) from t1 where a < 4) or a > 5; +explain +select * from t1 where a in (select max(a) from t1 where a < 4) or a > 5; + +drop table t1; + + diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 86ba0346366..f2be17f71d6 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1195,6 +1195,7 @@ JOIN::optimize() DBUG_PRINT("info",("Select tables optimized away")); zero_result_cause= "Select tables optimized away"; tables_list= 0; // All tables resolved + select_lex->min_max_opt_list.empty(); const_tables= top_join_tab_count= table_count; /* Extract all table-independent conditions and replace the WHERE From b850fc66ca72ed9b63cb8b899b64f8c555a525c7 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Wed, 7 Jun 2017 22:54:57 -0700 Subject: [PATCH 006/102] Fixed the bug mdev-12855. This is actually a legacy bug: SQL_SELECT::test_quick_select() was called with SQL_SELECT::head not set. It looks like that this problem can be reproduced only on queries with ORDER BY that use IN predicates converted to semi-joins. --- mysql-test/r/subselect_sj2_mat.result | 22 ++++++++++++++++++++++ mysql-test/t/subselect_sj2_mat.test | 20 ++++++++++++++++++++ sql/sql_select.cc | 5 ++++- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/subselect_sj2_mat.result b/mysql-test/r/subselect_sj2_mat.result index 202e6cc4b9e..835742a3ff4 100644 --- a/mysql-test/r/subselect_sj2_mat.result +++ b/mysql-test/r/subselect_sj2_mat.result @@ -1579,3 +1579,25 @@ Warnings: Note 1003 select `test`.`t1`.`i` AS `i` from `test`.`t1` semi join (`test`.`t2`) where ((rand() < 0)) drop table t1,t2; set optimizer_switch=@save_optimizer_switch; +# +# mdev-12855: materialization of a semi-join subquery + ORDER BY +# +CREATE TABLE t1 (f1 varchar(8), KEY(f1)) ENGINE=InnoDB; +INSERT INTO t1 VALUES ('qux'),('foo'); +CREATE TABLE t2 (f2 varchar(8)) ENGINE=InnoDB; +INSERT INTO t2 VALUES ('bar'),('foo'),('qux'); +SELECT f1 FROM t1 +WHERE f1 IN ( SELECT f2 FROM t2 WHERE f2 > 'bar' ) +HAVING f1 != 'foo' +ORDER BY f1; +f1 +qux +explain SELECT f1 FROM t1 +WHERE f1 IN ( SELECT f2 FROM t2 WHERE f2 > 'bar' ) +HAVING f1 != 'foo' +ORDER BY f1; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t1 index f1 f1 11 NULL 2 Using index +1 PRIMARY eq_ref distinct_key distinct_key 11 func 1 +2 MATERIALIZED t2 ALL NULL NULL NULL NULL 3 Using where +DROP TABLE t1,t2; diff --git a/mysql-test/t/subselect_sj2_mat.test b/mysql-test/t/subselect_sj2_mat.test index 0f2892ae2dc..cfb6c8c2819 100644 --- a/mysql-test/t/subselect_sj2_mat.test +++ b/mysql-test/t/subselect_sj2_mat.test @@ -283,3 +283,23 @@ select * from t1 where (rand() < 0) and i in (select i from t2); drop table t1,t2; set optimizer_switch=@save_optimizer_switch; + +--echo # +--echo # mdev-12855: materialization of a semi-join subquery + ORDER BY +--echo # + +CREATE TABLE t1 (f1 varchar(8), KEY(f1)) ENGINE=InnoDB; +INSERT INTO t1 VALUES ('qux'),('foo'); +CREATE TABLE t2 (f2 varchar(8)) ENGINE=InnoDB; +INSERT INTO t2 VALUES ('bar'),('foo'),('qux'); + +let $q= +SELECT f1 FROM t1 +WHERE f1 IN ( SELECT f2 FROM t2 WHERE f2 > 'bar' ) +HAVING f1 != 'foo' +ORDER BY f1; + +eval $q; +eval explain $q; + +DROP TABLE t1,t2; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f2be17f71d6..720c0a22681 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2759,8 +2759,11 @@ JOIN::exec() if (sort_table_cond) { if (!curr_table->select) + { if (!(curr_table->select= new SQL_SELECT)) DBUG_VOID_RETURN; + curr_table->select->head= curr_table->table; + } if (!curr_table->select->cond) curr_table->select->cond= sort_table_cond; else @@ -2846,7 +2849,7 @@ JOIN::exec() curr_join->select_limit, (select_options & OPTION_FOUND_ROWS ? HA_POS_ERROR : unit->select_limit_cnt), - curr_join->group_list ? TRUE : FALSE)) + curr_join->group_list ? FALSE : TRUE)) DBUG_VOID_RETURN; sortorder= curr_join->sortorder; if (curr_join->const_tables != curr_join->table_count && From 70b94c35d79eb9cef6963d535a5e8eb74a76198f Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 14 Jun 2017 11:27:36 +0200 Subject: [PATCH 007/102] cleanup: move common test into a function --- sql/sql_plugin.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 2ec67a89746..0ceb3088c6a 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -316,6 +316,12 @@ static plugin_ref intern_plugin_lock(LEX *lex, plugin_ref plugin); static void intern_plugin_unlock(LEX *lex, plugin_ref plugin); static void reap_plugins(void); +bool plugin_is_forced(struct st_plugin_int *p) +{ + return p->load_option == PLUGIN_FORCE || + p->load_option == PLUGIN_FORCE_PLUS_PERMANENT; +} + static void report_error(int where_to, uint error, ...) { va_list args; @@ -1657,8 +1663,7 @@ int plugin_init(int *argc, char **argv, int flags) while ((plugin_ptr= *(--reap))) { mysql_mutex_unlock(&LOCK_plugin); - if (plugin_ptr->load_option == PLUGIN_FORCE || - plugin_ptr->load_option == PLUGIN_FORCE_PLUS_PERMANENT) + if (plugin_is_forced(plugin_ptr)) reaped_mandatory_plugin= TRUE; plugin_deinitialize(plugin_ptr, true); mysql_mutex_lock(&LOCK_plugin); @@ -3505,8 +3510,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp, plugin_dash.length + 1); strxmov(plugin_name_with_prefix_ptr, plugin_dash.str, plugin_name_ptr, NullS); - if (tmp->load_option != PLUGIN_FORCE && - tmp->load_option != PLUGIN_FORCE_PLUS_PERMANENT) + if (!plugin_is_forced(tmp)) { /* support --skip-plugin-foo syntax */ options[0].name= plugin_name_ptr; @@ -3823,8 +3827,7 @@ static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp, We adjust the default value to account for the hardcoded exceptions we have set for the federated and ndbcluster storage engines. */ - if (tmp->load_option != PLUGIN_FORCE && - tmp->load_option != PLUGIN_FORCE_PLUS_PERMANENT) + if (!plugin_is_forced(tmp)) opts[0].def_value= opts[1].def_value= plugin_load_option; error= handle_options(argc, &argv, opts, NULL); @@ -3840,8 +3843,7 @@ static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp, Set plugin loading policy from option value. First element in the option list is always the option value. */ - if (tmp->load_option != PLUGIN_FORCE && - tmp->load_option != PLUGIN_FORCE_PLUS_PERMANENT) + if (!plugin_is_forced(tmp)) plugin_load_option= (enum_plugin_load_option) *(ulong*) opts[0].value; } From 918e47030b49867d449bd9aaa54257616d5ebe42 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 14 Jun 2017 11:30:32 +0200 Subject: [PATCH 008/102] MDEV-13063 Server crashes in intern_plugin_lock or assertion `plugin_ptr->ref_count == 1' fails in plugin_init if a forced plugin is disabled (for any reason, e.g. invalid command-line option) - it's an error --- mysql-test/t/bootstrap.test | 6 ++++++ sql/sql_plugin.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mysql-test/t/bootstrap.test b/mysql-test/t/bootstrap.test index 405c24a6d74..2930d936830 100644 --- a/mysql-test/t/bootstrap.test +++ b/mysql-test/t/bootstrap.test @@ -60,4 +60,10 @@ SHOW VARIABLES LIKE 'have_innodb'; SELECT 'bug' as '' FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb' and SUPPORT='YES'; +# +# MDEV-13063 Server crashes in intern_plugin_lock or assertion `plugin_ptr->ref_count == 1' fails in plugin_init +# +--error 1 +--exec $MYSQLD_BOOTSTRAP_CMD --myisam_recover_options=NONE + --echo End of 5.5 tests diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 0ceb3088c6a..75aca02990d 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1359,7 +1359,7 @@ static int plugin_initialize(MEM_ROOT *tmp_root, struct st_plugin_int *plugin, if (options_only || state == PLUGIN_IS_DISABLED) { - ret= 0; + ret= !options_only && plugin_is_forced(plugin); goto err; } From 5cbbfe9f54f15a5281439dc21f22b599a69b5f87 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 14 Jun 2017 00:33:11 +0200 Subject: [PATCH 009/102] cleanup: remove duplicate code --- sql/sql_partition.cc | 37 ++++++++++++++----------------------- sql/sql_priv.h | 2 +- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index b0fb38bf748..43f9797eb62 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1913,6 +1913,19 @@ static int add_subpartition_by(File fptr) return err + add_partition_by(fptr); } +static int add_name_string(File fptr, const char *name) +{ + int err; + String name_string("", 0, system_charset_info); + THD *thd= current_thd; + ulonglong save_options= thd->variables.option_bits; + thd->variables.option_bits&= ~OPTION_QUOTE_SHOW_CREATE; + append_identifier(thd, &name_string, name, strlen(name)); + thd->variables.option_bits= save_options; + err= add_string_object(fptr, &name_string); + return err; +} + static int add_part_field_list(File fptr, List field_list) { uint i, num_fields; @@ -1924,15 +1937,7 @@ static int add_part_field_list(File fptr, List field_list) err+= add_begin_parenthesis(fptr); while (i < num_fields) { - const char *field_str= part_it++; - String field_string("", 0, system_charset_info); - THD *thd= current_thd; - ulonglong save_options= thd->variables.option_bits; - thd->variables.option_bits&= ~OPTION_QUOTE_SHOW_CREATE; - append_identifier(thd, &field_string, field_str, - strlen(field_str)); - thd->variables.option_bits= save_options; - err+= add_string_object(fptr, &field_string); + err+= add_name_string(fptr, part_it++); if (i != (num_fields-1)) err+= add_comma(fptr); i++; @@ -1941,20 +1946,6 @@ static int add_part_field_list(File fptr, List field_list) return err; } -static int add_name_string(File fptr, const char *name) -{ - int err; - String name_string("", 0, system_charset_info); - THD *thd= current_thd; - ulonglong save_options= thd->variables.option_bits; - thd->variables.option_bits&= ~OPTION_QUOTE_SHOW_CREATE; - append_identifier(thd, &name_string, name, - strlen(name)); - thd->variables.option_bits= save_options; - err= add_string_object(fptr, &name_string); - return err; -} - static int add_int(File fptr, longlong number) { char buff[32]; diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 749ee245aa7..b5589cb4b22 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -121,7 +121,7 @@ #define OPTION_AUTOCOMMIT (1ULL << 8) // THD, user #define OPTION_BIG_SELECTS (1ULL << 9) // THD, user #define OPTION_LOG_OFF (1ULL << 10) // THD, user -#define OPTION_QUOTE_SHOW_CREATE (1ULL << 11) // THD, user, unused +#define OPTION_QUOTE_SHOW_CREATE (1ULL << 11) // THD, user #define TMP_TABLE_ALL_COLUMNS (1ULL << 12) // SELECT, intern #define OPTION_WARNINGS (1ULL << 13) // THD, user #define OPTION_AUTO_IS_NULL (1ULL << 14) // THD, user, binlog From c661b4d0fb38c103fc0b659a95e8552ea72574cf Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 14 Jun 2017 00:48:34 +0200 Subject: [PATCH 010/102] MDEV-13017 LOCK TABLE fails with irrelevant error while working with tables affected by ANSI_QUOTES --- mysql-test/suite/parts/r/quoting.result | 6 ++++++ mysql-test/suite/parts/t/quoting.test | 10 ++++++++++ sql/sql_partition.cc | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 mysql-test/suite/parts/r/quoting.result create mode 100644 mysql-test/suite/parts/t/quoting.test diff --git a/mysql-test/suite/parts/r/quoting.result b/mysql-test/suite/parts/r/quoting.result new file mode 100644 index 00000000000..ba6a155e6ac --- /dev/null +++ b/mysql-test/suite/parts/r/quoting.result @@ -0,0 +1,6 @@ +set sql_mode=ansi_quotes; +create table t1 (i int) partition by range (i) (partition flush values less than maxvalue); +set sql_mode=default; +lock tables t1 read local; +unlock tables; +drop table t1; diff --git a/mysql-test/suite/parts/t/quoting.test b/mysql-test/suite/parts/t/quoting.test new file mode 100644 index 00000000000..297896fd9cf --- /dev/null +++ b/mysql-test/suite/parts/t/quoting.test @@ -0,0 +1,10 @@ +# +# MDEV-13017 LOCK TABLE fails with irrelevant error while working with tables affected by ANSI_QUOTES +# +--source include/have_partition.inc +set sql_mode=ansi_quotes; +create table t1 (i int) partition by range (i) (partition flush values less than maxvalue); +set sql_mode=default; +lock tables t1 read local; +unlock tables; +drop table t1; diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 43f9797eb62..e6513fc7476 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1918,9 +1918,12 @@ static int add_name_string(File fptr, const char *name) int err; String name_string("", 0, system_charset_info); THD *thd= current_thd; + ulonglong save_sql_mode= thd->variables.sql_mode; + thd->variables.sql_mode&= ~MODE_ANSI_QUOTES; ulonglong save_options= thd->variables.option_bits; thd->variables.option_bits&= ~OPTION_QUOTE_SHOW_CREATE; append_identifier(thd, &name_string, name, strlen(name)); + thd->variables.sql_mode= save_sql_mode; thd->variables.option_bits= save_options; err= add_string_object(fptr, &name_string); return err; From 2579b252dd0e38c75a854052873c9bf41043e43f Mon Sep 17 00:00:00 2001 From: =Ian Gilfillan Date: Thu, 15 Jun 2017 12:35:53 +0200 Subject: [PATCH 011/102] Update MariaDB Foundation sponsors --- CREDITS | 24 +++++++++++++----------- mysql-test/r/contributors.result | 2 ++ sql/contributors.h | 2 ++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CREDITS b/CREDITS index d352232ad2e..6288c2cdea4 100644 --- a/CREDITS +++ b/CREDITS @@ -4,17 +4,19 @@ organization registered in the USA. The current main sponsors of the MariaDB Foundation are: Alibaba Cloud https://intl.aliyun.com (2017) -Booking.com https://www.booking.com (2013 - 2017) -Development Bank of Singapore https://dbs.com (2016 - 2017) -MariaDB Corporation https://www.mariadb.com (2013 - 2017) -Visma https://visma.com (2015 - 2017) -Acronis http://acronis.com (2016 - 2017) -Nexedi https://www.nexedi.com (2016 - 2017) -Automattic https://automattic.com (2014 - 2017) -Tencent Game DBA http://tencentdba.com/about (2016 - 2017) -Tencent TDSQL http://tdsql.org/ (2016 - 2017) -Verkkokauppa.com https://www.verkkokauppa.com (2015 - 2017) -Virtuozzo https://virtuozzo.com (2016 - 2017) +Booking.com https://www.booking.com (2013) +Tencent Cloud https://cloud.tencent.com (2017) +Development Bank of Singapore https://dbs.com (2016) +IBM https://www.ibm.com (2017) +MariaDB Corporation https://www.mariadb.com (2013) +Visma https://visma.com (2015) +Acronis http://acronis.com (2016) +Nexedi https://www.nexedi.com (2016) +Automattic https://automattic.com (2014) +Tencent Game DBA http://tencentdba.com/about (2016) +Tencent TDSQL http://tdsql.org (2016) +Verkkokauppa.com https://www.verkkokauppa.com (2015) +Virtuozzo https://virtuozzo.com (2016) For a full list of sponsors, see https://mariadb.org/about/supporters/ diff --git a/mysql-test/r/contributors.result b/mysql-test/r/contributors.result index 4a26d0f19dd..5d92184f191 100644 --- a/mysql-test/r/contributors.result +++ b/mysql-test/r/contributors.result @@ -2,9 +2,11 @@ SHOW CONTRIBUTORS; Name Location Comment Booking.com https://www.booking.com Founding member, Platinum Sponsor of the MariaDB Foundation Alibaba Cloud https://intl.aliyun.com Platinum Sponsor of the MariaDB Foundation +Tencent Cloud https://cloud.tencent.com Platinum Sponsor of the MariaDB Foundation MariaDB Corporation https://mariadb.com Founding member, Gold Sponsor of the MariaDB Foundation Visma https://visma.com Gold Sponsor of the MariaDB Foundation DBS https://dbs.com Gold Sponsor of the MariaDB Foundation +IBM https://www.ibm.com Gold Sponsor of the MariaDB Foundation Nexedi https://www.nexedi.com Silver Sponsor of the MariaDB Foundation Acronis http://www.acronis.com Silver Sponsor of the MariaDB Foundation Auttomattic https://automattic.com Bronze Sponsor of the MariaDB Foundation diff --git a/sql/contributors.h b/sql/contributors.h index 3a771e2b493..88a4a088acf 100644 --- a/sql/contributors.h +++ b/sql/contributors.h @@ -39,9 +39,11 @@ struct show_table_contributors_st show_table_contributors[]= { /* MariaDB foundation sponsors, in contribution, size , time order */ {"Booking.com", "https://www.booking.com", "Founding member, Platinum Sponsor of the MariaDB Foundation"}, {"Alibaba Cloud", "https://intl.aliyun.com", "Platinum Sponsor of the MariaDB Foundation"}, + {"Tencent Cloud", "https://cloud.tencent.com", "Platinum Sponsor of the MariaDB Foundation"}, {"MariaDB Corporation", "https://mariadb.com", "Founding member, Gold Sponsor of the MariaDB Foundation"}, {"Visma", "https://visma.com", "Gold Sponsor of the MariaDB Foundation"}, {"DBS", "https://dbs.com", "Gold Sponsor of the MariaDB Foundation"}, + {"IBM", "https://www.ibm.com", "Gold Sponsor of the MariaDB Foundation"}, {"Nexedi", "https://www.nexedi.com", "Silver Sponsor of the MariaDB Foundation"}, {"Acronis", "http://www.acronis.com", "Silver Sponsor of the MariaDB Foundation"}, {"Auttomattic", "https://automattic.com", "Bronze Sponsor of the MariaDB Foundation"}, From 34da3be8a832306410ddb42006f8a067d38127be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Mon, 22 May 2017 13:38:26 +0300 Subject: [PATCH 012/102] MDEV-10463: Granted as a whole to roles, databases are not show in SHOW DATABASES The problem lies in not checking role privileges as well during SHOW DATABASES command. This problem is also apparent for SHOW CREATE DATABASE command. Other SHOW COMMANDS make use of check_access, which in turn makes use of acl_get for both priv_user and priv_role parts, which allows them to function correctly. --- .../roles/show_create_database-10463.result | 65 +++++++++++++++++++ .../roles/show_create_database-10463.test | 55 ++++++++++++++++ sql/sql_show.cc | 15 +++-- 3 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 mysql-test/suite/roles/show_create_database-10463.result create mode 100644 mysql-test/suite/roles/show_create_database-10463.test diff --git a/mysql-test/suite/roles/show_create_database-10463.result b/mysql-test/suite/roles/show_create_database-10463.result new file mode 100644 index 00000000000..1bf14933966 --- /dev/null +++ b/mysql-test/suite/roles/show_create_database-10463.result @@ -0,0 +1,65 @@ +drop database if exists db; +Warnings: +Note 1008 Can't drop database 'db'; database doesn't exist +create role r1; +create user beep@'%'; +create database db; +create table db.t1 (i int); +create table db.t2 (b int); +grant select on db.* to r1; +grant r1 to beep@'%'; +show databases; +Database +information_schema +test +show create database db; +ERROR 42000: Access denied for user 'beep'@'localhost' to database 'db' +select table_schema, table_name from information_schema.tables +where table_schema = 'db'; +table_schema table_name +set role r1; +show databases; +Database +db +information_schema +test +show create database db; +Database Create Database +db CREATE DATABASE `db` /*!40100 DEFAULT CHARACTER SET latin1 */ +select table_schema, table_name from information_schema.tables +where table_schema = 'db'; +table_schema table_name +db t1 +db t2 +create role r2; +create user beep2@'%'; +grant update on db.* to r2; +grant r2 to beep2; +show databases; +Database +information_schema +test +show create database db; +ERROR 42000: Access denied for user 'beep2'@'localhost' to database 'db' +select table_schema, table_name from information_schema.tables +where table_schema = 'db'; +table_schema table_name +set role r2; +show databases; +Database +db +information_schema +test +show create database db; +Database Create Database +db CREATE DATABASE `db` /*!40100 DEFAULT CHARACTER SET latin1 */ +select table_schema, table_name from information_schema.tables +where table_schema = 'db'; +table_schema table_name +db t1 +db t2 +drop database db; +drop role r1; +drop user beep; +drop role r2; +drop user beep2; diff --git a/mysql-test/suite/roles/show_create_database-10463.test b/mysql-test/suite/roles/show_create_database-10463.test new file mode 100644 index 00000000000..2d921629c10 --- /dev/null +++ b/mysql-test/suite/roles/show_create_database-10463.test @@ -0,0 +1,55 @@ +source include/not_embedded.inc; + +drop database if exists db; + +create role r1; +create user beep@'%'; + +create database db; +create table db.t1 (i int); +create table db.t2 (b int); +grant select on db.* to r1; +grant r1 to beep@'%'; + +--connect (con1,localhost,beep,,) +show databases; +--error ER_DBACCESS_DENIED_ERROR +show create database db; +select table_schema, table_name from information_schema.tables +where table_schema = 'db'; + +set role r1; +show databases; +show create database db; +select table_schema, table_name from information_schema.tables +where table_schema = 'db'; + + +connection default; +create role r2; +create user beep2@'%'; + +grant update on db.* to r2; +grant r2 to beep2; +--connect (con2,localhost,beep2,,) +show databases; +--error ER_DBACCESS_DENIED_ERROR +show create database db; +select table_schema, table_name from information_schema.tables +where table_schema = 'db'; + +set role r2; +show databases; + +show create database db; +select table_schema, table_name from information_schema.tables +where table_schema = 'db'; + + +connection default; + +drop database db; +drop role r1; +drop user beep; +drop role r2; +drop user beep2; diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 3f161fb8aec..9a743388149 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1167,8 +1167,13 @@ bool mysqld_show_create_db(THD *thd, LEX_STRING *dbname, if (test_all_bits(sctx->master_access, DB_ACLS)) db_access=DB_ACLS; else - db_access= (acl_get(sctx->host, sctx->ip, sctx->priv_user, dbname->str, 0) | - sctx->master_access); + { + db_access= acl_get(sctx->host, sctx->ip, sctx->priv_user, dbname->str, 0) | + sctx->master_access; + if (sctx->priv_role[0]) + db_access|= acl_get("", "", sctx->priv_role, dbname->str, 0); + } + if (!(db_access & DB_ACLS) && check_grant_db(thd,dbname->str)) { status_var_increment(thd->status_var.access_denied_errors); @@ -5118,8 +5123,10 @@ int fill_schema_schemata(THD *thd, TABLE_LIST *tables, COND *cond) } #ifndef NO_EMBEDDED_ACCESS_CHECKS if (sctx->master_access & (DB_ACLS | SHOW_DB_ACL) || - acl_get(sctx->host, sctx->ip, sctx->priv_user, db_name->str, 0) || - !check_grant_db(thd, db_name->str)) + acl_get(sctx->host, sctx->ip, sctx->priv_user, db_name->str, false) || + (sctx->priv_role[0] ? + acl_get("", "", sctx->priv_role, db_name->str, false) : 0) || + !check_grant_db(thd, db_name->str)) #endif { load_db_opt_by_name(thd, db_name->str, &create); From f0ad93403f4f39873618759585ca765169ecf000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Mon, 22 May 2017 17:06:01 +0300 Subject: [PATCH 013/102] MDEV-12666: CURRENT_ROLE() and DATABASE() does not work in a view The problem lies in how CURRENT_ROLE is defined. The Item_func_current_role inherits from Item_func_sysconst, which defines a safe_charset_converter to be a const_charset_converter. During view creation, if there is no role previously set, the current_role() function returns NULL. This is captured on item instantiation and the const_charset_converter call subsequently returns an Item_null. In turn, the function is replaced with Item_null and the view is then created with an Item_null instead of Item_func_current_role. Without this patch, the first SHOW CREATE VIEW from the testcase would have a where clause of WHERE role_name = NULL, while the second SHOW CREATE VIEW would show a correctly created view. The same applies for the DATABASE function, as it can change as well. There is an additional problem with CURRENT_ROLE() when used in a prepared statement. During prepared statement creation we used to set the string_value of the function to the current role as well as the null_value flag. During execution, if CURRENT_ROLE was not null, the null_value flag was never set to not-null during fix_fields. Item_func_current_user however can never be NULL so it did not show this problem in a view before. At the same time, the CURRENT_USER() can not be changed between prepared statement execution and creation so the implementation where the value is stored during fix_fields is sufficient. Note also that DATABASE() function behaves differently during prepared statements. See bug 25843 for details or commit 7e0ad09edff587dadc3e9855fc81e1b7de8f2199 --- mysql-test/r/view.result | 62 +++++++++++ .../roles/current_role_view-12666.result | 103 ++++++++++++++++++ .../suite/roles/current_role_view-12666.test | 102 +++++++++++++++++ mysql-test/t/view.test | 49 +++++++++ sql/item.cc | 1 + sql/item.h | 2 +- sql/item_strfunc.cc | 27 ++++- sql/item_strfunc.h | 8 +- 8 files changed, 345 insertions(+), 9 deletions(-) create mode 100644 mysql-test/suite/roles/current_role_view-12666.result create mode 100644 mysql-test/suite/roles/current_role_view-12666.test diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index d6da2a03b46..30c3aaba36e 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -5944,6 +5944,68 @@ use_case_id InitialDeadline 10 2015-12-18 drop view v1; drop table t1; +# +# MDEV-12666: CURRENT_ROLE() and DATABASE() does not work in a view +# +# DATABASE() fails only when the initial view creation features a NULL +# default database. +# +# CREATE, USE and DROP database so that we have no "default" database. +# +CREATE DATABASE temporary; +USE temporary; +DROP DATABASE temporary; +SELECT DATABASE(); +DATABASE() +NULL +CREATE VIEW test.v_no_db AS SELECT DATABASE() = 'temporary_two'; +SHOW CREATE VIEW test.v_no_db; +View Create View character_set_client collation_connection +v_no_db CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v_no_db` AS select (database() = 'temporary_two') AS `DATABASE() = 'temporary_two'` latin1 latin1_swedish_ci +PREPARE prepared_no_database FROM "SELECT DATABASE() = 'temporary_two'"; +# +# All statements should return NULL +# +EXECUTE prepared_no_database; +DATABASE() = 'temporary_two' +NULL +SELECT DATABASE() = 'temporary_two'; +DATABASE() = 'temporary_two' +NULL +SELECT * FROM test.v_no_db; +DATABASE() = 'temporary_two' +NULL +CREATE DATABASE temporary_two; +USE temporary_two; +CREATE VIEW test.v_with_db AS SELECT DATABASE() = 'temporary_two'; +PREPARE prepared_with_database FROM "SELECT DATABASE() = 'temporary_two'"; +# +# All statements should return 1; +# +SELECT DATABASE() = 'temporary_two'; +DATABASE() = 'temporary_two' +1 +SELECT * FROM test.v_no_db; +DATABASE() = 'temporary_two' +1 +SELECT * FROM test.v_with_db; +DATABASE() = 'temporary_two' +1 +EXECUTE prepared_with_database; +DATABASE() = 'temporary_two' +1 +# +# Prepared statements maintain default database to be the same +# during on creation so this should return NULL still. +# See MySQL bug #25843 +# +EXECUTE prepared_no_database; +DATABASE() = 'temporary_two' +NULL +DROP DATABASE temporary_two; +DROP VIEW test.v_no_db; +DROP VIEW test.v_with_db; +USE test; # ----------------------------------------------------------------- # -- End of 10.0 tests. # ----------------------------------------------------------------- diff --git a/mysql-test/suite/roles/current_role_view-12666.result b/mysql-test/suite/roles/current_role_view-12666.result new file mode 100644 index 00000000000..1d14593be4b --- /dev/null +++ b/mysql-test/suite/roles/current_role_view-12666.result @@ -0,0 +1,103 @@ +CREATE USER has_role@'localhost'; +GRANT ALL PRIVILEGES ON *.* TO has_role@'localhost'; +CREATE ROLE test_role; +GRANT test_role TO has_role@'localhost'; +CREATE USER no_role@'localhost'; +GRANT ALL PRIVILEGES ON *.* TO no_role@'localhost'; +CREATE TABLE view_role_test ( +id int primary key, +role_name varchar(50) +); +INSERT INTO view_role_test VALUES (1, 'test_role'); +# +# Use the same logic for stored procedures. +# +PREPARE prepared_no_current_role FROM "SELECT * from view_role_test WHERE role_name = CURRENT_ROLE()"; +# +# Creating a view with no CURRENT_ROLE() set and one with CURRENT_ROLE() +# set. Both should produce the same SHOW CREATE VIEW output. +# +CREATE +DEFINER = no_role@localhost +SQL SECURITY INVOKER +VIEW v_view_role_test_no_current_role +AS +SELECT * FROM view_role_test WHERE role_name = CURRENT_ROLE(); +SHOW CREATE VIEW v_view_role_test_no_current_role; +View Create View character_set_client collation_connection +v_view_role_test_no_current_role CREATE ALGORITHM=UNDEFINED DEFINER=`no_role`@`localhost` SQL SECURITY INVOKER VIEW `v_view_role_test_no_current_role` AS select `view_role_test`.`id` AS `id`,`view_role_test`.`role_name` AS `role_name` from `view_role_test` where (`view_role_test`.`role_name` = current_role()) latin1 latin1_swedish_ci +# +# No values should be returned +# +EXECUTE prepared_no_current_role; +id role_name +SELECT * FROM view_role_test WHERE role_name = CURRENT_ROLE(); +id role_name +SELECT * FROM v_view_role_test_no_current_role; +id role_name +# +# Now let's set the role. Create identical views as before. See if +# their behaviour is different. It should not be. +# +SET ROLE test_role; +SELECT CURRENT_USER(); +CURRENT_USER() +root@localhost +SELECT CURRENT_ROLE(); +CURRENT_ROLE() +test_role +# +# Create the VIEW and prepared Statement with a CURRENT_ROLE() set. +# +CREATE +DEFINER = no_role@localhost +SQL SECURITY INVOKER +VIEW v_view_role_test_with_current_role +AS +SELECT * FROM view_role_test WHERE role_name = CURRENT_ROLE(); +PREPARE prepared_with_current_role FROM "SELECT * from view_role_test WHERE role_name = CURRENT_ROLE()"; +SHOW CREATE VIEW v_view_role_test_with_current_role; +View Create View character_set_client collation_connection +v_view_role_test_with_current_role CREATE ALGORITHM=UNDEFINED DEFINER=`no_role`@`localhost` SQL SECURITY INVOKER VIEW `v_view_role_test_with_current_role` AS select `view_role_test`.`id` AS `id`,`view_role_test`.`role_name` AS `role_name` from `view_role_test` where (`view_role_test`.`role_name` = current_role()) latin1 latin1_swedish_ci +# +# Values should be returned for all select statements as we do have +# a CURRENT_ROLE() active; +# +EXECUTE prepared_no_current_role; +id role_name +1 test_role +EXECUTE prepared_with_current_role; +id role_name +1 test_role +SELECT * FROM view_role_test WHERE role_name = CURRENT_ROLE(); +id role_name +1 test_role +SELECT * FROM v_view_role_test_no_current_role; +id role_name +1 test_role +SELECT * FROM v_view_role_test_with_current_role; +id role_name +1 test_role +SET ROLE NONE; +# +# No values should be returned for all select statements as we do not have +# a CURRENT_ROLE() active; +# +EXECUTE prepared_no_current_role; +id role_name +EXECUTE prepared_with_current_role; +id role_name +SELECT * FROM view_role_test WHERE role_name = CURRENT_ROLE(); +id role_name +SELECT * FROM v_view_role_test_no_current_role; +id role_name +SELECT * FROM v_view_role_test_with_current_role; +id role_name +DROP USER has_role@'localhost'; +DROP USER no_role@'localhost'; +DROP ROLE test_role; +DROP table view_role_test; +DROP VIEW v_view_role_test_no_current_role; +DROP VIEW v_view_role_test_with_current_role; +DROP PREPARE prepared_no_current_role; +DROP PREPARE prepared_with_current_role; diff --git a/mysql-test/suite/roles/current_role_view-12666.test b/mysql-test/suite/roles/current_role_view-12666.test new file mode 100644 index 00000000000..32039ffef07 --- /dev/null +++ b/mysql-test/suite/roles/current_role_view-12666.test @@ -0,0 +1,102 @@ +# +# MDEV-12666 CURRENT_ROLE() does not work in a view +# +--source include/not_embedded.inc + +CREATE USER has_role@'localhost'; +GRANT ALL PRIVILEGES ON *.* TO has_role@'localhost'; + +CREATE ROLE test_role; +GRANT test_role TO has_role@'localhost'; + +CREATE USER no_role@'localhost'; +GRANT ALL PRIVILEGES ON *.* TO no_role@'localhost'; + +CREATE TABLE view_role_test ( + id int primary key, + role_name varchar(50) + ); + +INSERT INTO view_role_test VALUES (1, 'test_role'); + +--echo # +--echo # Use the same logic for stored procedures. +--echo # +PREPARE prepared_no_current_role FROM "SELECT * from view_role_test WHERE role_name = CURRENT_ROLE()"; + +--echo # +--echo # Creating a view with no CURRENT_ROLE() set and one with CURRENT_ROLE() +--echo # set. Both should produce the same SHOW CREATE VIEW output. +--echo # +CREATE +DEFINER = no_role@localhost +SQL SECURITY INVOKER +VIEW v_view_role_test_no_current_role +AS +SELECT * FROM view_role_test WHERE role_name = CURRENT_ROLE(); + +SHOW CREATE VIEW v_view_role_test_no_current_role; + + +--echo # +--echo # No values should be returned +--echo # +EXECUTE prepared_no_current_role; +SELECT * FROM view_role_test WHERE role_name = CURRENT_ROLE(); +SELECT * FROM v_view_role_test_no_current_role; + +--echo # +--echo # Now let's set the role. Create identical views as before. See if +--echo # their behaviour is different. It should not be. +--echo # +SET ROLE test_role; + +SELECT CURRENT_USER(); +SELECT CURRENT_ROLE(); + +--echo # +--echo # Create the VIEW and prepared Statement with a CURRENT_ROLE() set. +--echo # +CREATE +DEFINER = no_role@localhost +SQL SECURITY INVOKER +VIEW v_view_role_test_with_current_role +AS +SELECT * FROM view_role_test WHERE role_name = CURRENT_ROLE(); + +PREPARE prepared_with_current_role FROM "SELECT * from view_role_test WHERE role_name = CURRENT_ROLE()"; + +SHOW CREATE VIEW v_view_role_test_with_current_role; + + +--echo # +--echo # Values should be returned for all select statements as we do have +--echo # a CURRENT_ROLE() active; +--echo # +EXECUTE prepared_no_current_role; +EXECUTE prepared_with_current_role; +SELECT * FROM view_role_test WHERE role_name = CURRENT_ROLE(); +SELECT * FROM v_view_role_test_no_current_role; +SELECT * FROM v_view_role_test_with_current_role; + +SET ROLE NONE; +--echo # +--echo # No values should be returned for all select statements as we do not have +--echo # a CURRENT_ROLE() active; +--echo # +EXECUTE prepared_no_current_role; +EXECUTE prepared_with_current_role; +SELECT * FROM view_role_test WHERE role_name = CURRENT_ROLE(); +SELECT * FROM v_view_role_test_no_current_role; +SELECT * FROM v_view_role_test_with_current_role; + + +DROP USER has_role@'localhost'; +DROP USER no_role@'localhost'; +DROP ROLE test_role; + +DROP table view_role_test; +DROP VIEW v_view_role_test_no_current_role; +DROP VIEW v_view_role_test_with_current_role; +DROP PREPARE prepared_no_current_role; +DROP PREPARE prepared_with_current_role; diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index 89a8e0c9ffc..db48e1a7661 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -5814,6 +5814,55 @@ SELECT * FROM v1 where use_case_id = 10; drop view v1; drop table t1; +--echo # +--echo # MDEV-12666: CURRENT_ROLE() and DATABASE() does not work in a view +--echo # +--echo # DATABASE() fails only when the initial view creation features a NULL +--echo # default database. +--echo # +--echo # CREATE, USE and DROP database so that we have no "default" database. +--echo # +CREATE DATABASE temporary; +USE temporary; +DROP DATABASE temporary; +SELECT DATABASE(); + +CREATE VIEW test.v_no_db AS SELECT DATABASE() = 'temporary_two'; +SHOW CREATE VIEW test.v_no_db; +PREPARE prepared_no_database FROM "SELECT DATABASE() = 'temporary_two'"; + +--echo # +--echo # All statements should return NULL +--echo # +EXECUTE prepared_no_database; +SELECT DATABASE() = 'temporary_two'; +SELECT * FROM test.v_no_db; + +CREATE DATABASE temporary_two; +USE temporary_two; +CREATE VIEW test.v_with_db AS SELECT DATABASE() = 'temporary_two'; +PREPARE prepared_with_database FROM "SELECT DATABASE() = 'temporary_two'"; + +--echo # +--echo # All statements should return 1; +--echo # +SELECT DATABASE() = 'temporary_two'; +SELECT * FROM test.v_no_db; +SELECT * FROM test.v_with_db; +EXECUTE prepared_with_database; + +--echo # +--echo # Prepared statements maintain default database to be the same +--echo # during on creation so this should return NULL still. +--echo # See MySQL bug #25843 +--echo # +EXECUTE prepared_no_database; + +DROP DATABASE temporary_two; +DROP VIEW test.v_no_db; +DROP VIEW test.v_with_db; +USE test; + --echo # ----------------------------------------------------------------- --echo # -- End of 10.0 tests. --echo # ----------------------------------------------------------------- diff --git a/sql/item.cc b/sql/item.cc index 4ce8396f71e..77b6ff5b82d 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1263,6 +1263,7 @@ Item *Item::const_charset_converter(CHARSET_INFO *tocs, DBUG_ASSERT(fixed); StringBuffer<64>tmp; String *s= val_str(&tmp); + if (!s) return new Item_null((char *) func_name, tocs); diff --git a/sql/item.h b/sql/item.h index 4d33a0eb6c1..28a6649b9b1 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1476,7 +1476,7 @@ public: virtual Item *expr_cache_insert_transformer(uchar *thd_arg) { return this; } virtual bool expr_cache_is_needed(THD *) { return FALSE; } virtual Item *safe_charset_converter(CHARSET_INFO *tocs); - bool needs_charset_converter(uint32 length, CHARSET_INFO *tocs) + bool needs_charset_converter(uint32 length, CHARSET_INFO *tocs) const { /* This will return "true" if conversion happens: diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 7cd712cc5e1..08b9ded80f5 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2344,6 +2344,7 @@ String *Item_func_database::val_str(String *str) } else str->copy(thd->db, thd->db_length, system_charset_info); + null_value= 0; return str; } @@ -2378,6 +2379,28 @@ bool Item_func_user::init(const char *user, const char *host) } +Item *Item_func_sysconst::safe_charset_converter(CHARSET_INFO *tocs) +{ + /* + During view or prepared statement creation, the item should not + make use of const_charset_converter as it would imply substitution + with constant items which is not correct. Functions can have different + values during view creation and view execution based on context. + + Return the identical item during view creation and prepare. + */ + if (!Item_func_sysconst::const_item()) + return this; + return const_charset_converter(tocs, true, fully_qualified_func_name()); +} + +bool Item_func_sysconst::const_item() const +{ + if (current_thd->lex->is_ps_or_view_context_analysis()) + return false; + return true; +} + bool Item_func_user::fix_fields(THD *thd, Item **ref) { return (Item_func_sysconst::fix_fields(thd, ref) || @@ -2403,21 +2426,19 @@ bool Item_func_current_role::fix_fields(THD *thd, Item **ref) Security_context *ctx= context->security_ctx ? context->security_ctx : thd->security_ctx; - if (ctx->priv_role[0]) { if (str_value.copy(ctx->priv_role, strlen(ctx->priv_role), system_charset_info)) return 1; - str_value.mark_as_const(); + null_value= maybe_null= 0; return 0; } null_value= maybe_null= 1; return 0; } - void Item_func_soundex::fix_length_and_dec() { uint32 char_length= args[0]->max_char_length(); diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 2886cb68f9b..78989e9f517 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -542,10 +542,7 @@ class Item_func_sysconst :public Item_str_func public: Item_func_sysconst() { collation.set(system_charset_info,DERIVATION_SYSCONST); } - Item *safe_charset_converter(CHARSET_INFO *tocs) - { - return const_charset_converter(tocs, true, fully_qualified_func_name()); - } + Item *safe_charset_converter(CHARSET_INFO *tocs); /* Used to create correct Item name in new converted item in safe_charset_converter, return string representation of this function @@ -557,6 +554,7 @@ public: return trace_unsupported_by_check_vcol_func_processor( fully_qualified_func_name()); } + bool const_item() const; }; @@ -635,7 +633,7 @@ public: String *val_str(String *) { DBUG_ASSERT(fixed == 1); - return (null_value ? 0 : &str_value); + return null_value ? NULL : &str_value; } }; From c7141fa75df91ae4c2a1214283111eeb1c2eda11 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 15 Jun 2017 14:41:59 +0200 Subject: [PATCH 014/102] MDEV-13002 mysqltest regex replace results in incorrect result regex didn't replace lines that were split by 16K chunk reads. --- client/mysqltest.cc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index b22959677d0..4de40953f7d 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1698,12 +1698,22 @@ int cat_file(DYNAMIC_STRING* ds, const char* filename) { int fd; size_t len; - char buff[16384]; + char *buff; if ((fd= my_open(filename, O_RDONLY, MYF(0))) < 0) return 1; - while((len= my_read(fd, (uchar*)&buff, - sizeof(buff)-1, MYF(0))) > 0) + + len= (size_t) my_seek(fd, 0, SEEK_END, MYF(0)); + my_seek(fd, 0, SEEK_SET, MYF(0)); + if (len == (size_t)MY_FILEPOS_ERROR || + !(buff= (char*)my_malloc(len + 1, MYF(0)))) + { + my_close(fd, MYF(0)); + return 1; + } + len= my_read(fd, (uchar*)buff, len, MYF(0)); + my_close(fd, MYF(0)); + { char *p= buff, *start= buff,*end=buff+len; while (p < end) @@ -1726,7 +1736,7 @@ int cat_file(DYNAMIC_STRING* ds, const char* filename) *p= 0; replace_dynstr_append_mem(ds, start, p-start); } - my_close(fd, MYF(0)); + my_free(buff); return 0; } From e548e2184bed04478ba1fe5107da817bc768d023 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 26 Mar 2017 16:00:35 +1100 Subject: [PATCH 015/102] Use CPACK_RPM_FILE_NAME="RPM-DEFAULT" This has been implemented in for cmake-3.6 to match distro version of what the filename should look like. Thanks to Domen Vranka for the suggestion. --- cmake/cpack_rpm.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 5789eb7694a..c3ec731144b 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -28,7 +28,11 @@ SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts Common Client SharedLibraries) SET(CPACK_RPM_PACKAGE_NAME "MariaDB") -SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") +IF(CMAKE_VERSION VERSION_LESS "3.6.0") + SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") +ELSE() + SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT") +ENDIF() SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}") SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2") From 48429359d6bb6382245f1949c458f8219996aa4a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 16 Jun 2017 11:34:59 +0200 Subject: [PATCH 016/102] MDEV-4646 No mysqld-debug or debuginfo in MariaDB-Server RPM --- cmake/cpack_rpm.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index c3ec731144b..4e9410306a8 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -32,6 +32,7 @@ IF(CMAKE_VERSION VERSION_LESS "3.6.0") SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") ELSE() SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT") + SET(CPACK_RPM_DEBUGINFO_PACKAGE ON) ENDIF() SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}") From 3a37afec293e36e51b83a9bd338ad5f74e7f63c0 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Mon, 19 Jun 2017 12:45:32 +0400 Subject: [PATCH 017/102] MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery The bug happens because of a combination of unfortunate circumstances: 1. Arguments args[0] and args[2] of Item_func_concat point recursively (through Item_direct_view_ref's) to the same Item_func_conv_charset. Both args[0]->args[0]->ref[0] and args[2]->args[0]->ref[0] refer to this Item_func_conv_charset. 2. When Item_func_concat::args[0]->val_str() is called, Item_func_conv_charset::val_str() writes its result to Item_func_conc_charset::tmp_value. 3. Then, for optimization purposes (to avoid copying), Item_func_substr::val_str() initializes Item_func_substr::tmp_value to point to the buffer fragment owned by Item_func_conv_charset::tmp_value Item_func_substr::tmp_value is returned as a result of Item_func_concat::args[0]->val_str(). 4. Due to optimization to avoid memory reallocs, Item_func_concat::val_str() remembers the result of args[0]->val_str() in "res" and further uses "res" to collect the return value. 5. When Item_func_concat::args[2]->val_str() is called, Item_func_conv_charset::tmp_value gets overwritten (see #1), which effectively overwrites args[0]'s Item_func_substr::tmp_value (see #3), which effectively overwrites "res" (see #4). This patch does the following: a. Changes Item_func_conv_charset::val_str(String *str) to use tmp_value and str the other way around. After this change tmp_value is used to store a temporary result, while str is used to return the value. The fixes the second problem (without SUBSTR): SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT CONVERT(t USING latin1) t2 FROM t1) sub; As Item_func_concat::val_str() supplies two different buffers when calling args[0]->val_str() and args[2]->val_str(), in the new reduction the result created during args[0]->val_str() does not get overwritten by args[2]->val_str(). b. Fixing the same problem in val_str() for similar classes Item_func_to_base64 Item_func_from_base64 Item_func_weight_string Item_func_hex Item_func_unhex Item_func_quote Item_func_compress Item_func_uncompress Item_func_des_encrypt Item_func_des_decrypt Item_func_conv_charset Item_func_reverse Item_func_soundex Item_func_aes_encrypt Item_func_aes_decrypt Item_func_buffer c. Fixing Item_func::val_str_from_val_str_ascii() the same way. Now Item_str_ascii_func::ascii_buff is used for temporary value, while the parameter passed to val_str() is used to return the result. This fixes the same problem when conversion (from ASCII to e.g. UCS2) takes place. See the ctype_ucs.test for example queries that returned wrong results before the fix. d. Some Item_func descendand classes had temporary String buffers (tmp_value and tmp_str), but did not really use them. Removing these temporary buffers from: Item_func_decode_histogram Item_func_format Item_func_binlog_gtid_pos Item_func_spatial_collection: e. Removing Item_func_buffer::tmp_value, because it's not used any more. f. Renaming Item_func_[un]compress::buffer to "tmp_value", for consistency with other classes. Note, this patch does not fix the following classes (although they have a similar problem): Item_str_conv Item_func_make_set Item_char_typecast They have a complex implementations and simple swapping between "tmp_value" and "str" won't work. These classes will be fixed separately. --- mysql-test/r/ctype_ucs.result | 17 +++ mysql-test/r/func_concat.result | 113 +++++++++++++++++ mysql-test/r/func_crypt.result | 18 +++ mysql-test/r/gis.result | 18 +++ mysql-test/t/ctype_ucs.test | 16 +++ mysql-test/t/func_concat.test | 91 ++++++++++++++ mysql-test/t/func_crypt.test | 24 ++++ mysql-test/t/gis.test | 15 +++ sql/item.h | 33 +++-- sql/item_geofunc.cc | 2 +- sql/item_geofunc.h | 2 - sql/item_strfunc.cc | 211 +++++++++++++++++--------------- sql/item_strfunc.h | 8 +- 13 files changed, 438 insertions(+), 130 deletions(-) diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result index 843b49c1f75..8c69745b12c 100644 --- a/mysql-test/r/ctype_ucs.result +++ b/mysql-test/r/ctype_ucs.result @@ -5552,5 +5552,22 @@ SELECT 'a','aa'; a aa a aa # +# MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery +# +SET NAMES utf8, character_set_connection=ucs2; +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch=_utf8'derived_merge=on'; +CREATE TABLE t1 (t VARCHAR(10) CHARSET latin1); +INSERT INTO t1 VALUES('abcdefghi'); +SET NAMES utf8, character_set_connection=ucs2; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT HEX(t) t2 FROM t1) sub; +c2 +616263646566676869-616263646566676869 +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT TO_BASE64(t) t2 FROM t1) sub; +c2 +YWJjZGVmZ2hp-YWJjZGVmZ2hp +DROP TABLE t1; +SET optimizer_switch=@save_optimizer_switch; +# # End of 10.0 tests # diff --git a/mysql-test/r/func_concat.result b/mysql-test/r/func_concat.result index 925158ab129..b87ee7bfc52 100644 --- a/mysql-test/r/func_concat.result +++ b/mysql-test/r/func_concat.result @@ -149,3 +149,116 @@ CALL p1(); ########################################40100.000 DROP PROCEDURE p1; # End of 5.1 tests +# +# Start of 10.0 tests +# +# +# MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery +# +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch='derived_merge=on'; +CREATE TABLE t1 (t VARCHAR(10) CHARSET latin1); +INSERT INTO t1 VALUES('1234567'); +SELECT CONCAT(SUBSTR(t2, 1, 3), SUBSTR(t2, 5)) c1, +CONCAT(SUBSTR(t2,1,3),'---',SUBSTR(t2,5)) c2 +FROM (SELECT CONVERT(t USING latin1) t2 FROM t1) sub; +c1 c2 +123567 123---567 +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT CONVERT(t USING latin1) t2 FROM t1) sub; +c2 +1234567-1234567 +DROP TABLE t1; +CREATE TABLE t1 (t VARCHAR(10) CHARSET latin1); +INSERT INTO t1 VALUES('1234567'); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT CONVERT(t USING latin1) t2 FROM t1) sub; +c2 +1234567-1234567 +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT REVERSE(t) t2 FROM t1) sub; +c2 +7654321-7654321 +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT SOUNDEX(t) t2 FROM t1) sub; +c2 +- +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT TO_BASE64(t) t2 FROM t1) sub; +c2 +MTIzNDU2Nw==-MTIzNDU2Nw== +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT WEIGHT_STRING(t) t2 FROM t1) sub; +c2 +1234567-1234567 +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT HEX(t) t2 FROM t1) sub; +c2 +31323334353637-31323334353637 +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT QUOTE(t) t2 FROM t1) sub; +c2 +'1234567'-'1234567' +DROP TABLE t1; +CREATE TABLE t1 (t VARCHAR(32) CHARSET latin1); +INSERT INTO t1 VALUES(TO_BASE64('abcdefghi')); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT FROM_BASE64(t) t2 FROM t1) sub; +c2 +abcdefghi-abcdefghi +DROP TABLE t1; +CREATE TABLE t1 (t VARCHAR(32) CHARSET latin1); +INSERT INTO t1 VALUES(HEX('abcdefghi')); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT UNHEX(t) t2 FROM t1) sub; +c2 +abcdefghi-abcdefghi +DROP TABLE t1; +CREATE TABLE t1 (t VARCHAR(30) CHARSET latin1); +INSERT INTO t1 VALUES('test'); +SELECT LENGTH(CONCAT(t2)) c2 FROM (SELECT AES_ENCRYPT(t,'x') t2 FROM t1) sub; +c2 +16 +SELECT LENGTH(CONCAT(t2,'-',t2)) c2 FROM (SELECT AES_ENCRYPT(t,'x') t2 FROM t1) sub; +c2 +33 +SELECT LENGTH(CONCAT(t2,'--',t2)) c2 FROM (SELECT AES_ENCRYPT(t,'x') t2 FROM t1) sub; +c2 +34 +SELECT LENGTH(CONCAT(t2)) c2 FROM (SELECT AES_DECRYPT(AES_ENCRYPT(t,'x'),'x') t2 FROM t1) sub; +c2 +4 +SELECT LENGTH(CONCAT(t2,'-',t2)) c2 FROM (SELECT AES_DECRYPT(AES_ENCRYPT(t,'x'),'x') t2 FROM t1) sub; +c2 +9 +SELECT LENGTH(CONCAT(t2,'--',t2)) c2 FROM (SELECT AES_DECRYPT(AES_ENCRYPT(t,'x'),'x') t2 FROM t1) sub; +c2 +10 +DROP TABLE t1; +CREATE TABLE t1 (t VARCHAR(64) CHARSET latin1); +INSERT INTO t1 VALUES('123456789'); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT MD5(t) t2 FROM t1) sub; +c2 +25f9e794323b453885f5181f1b624d0b-25f9e794323b453885f5181f1b624d0b +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT FORMAT(t,2) t2 FROM t1) sub; +c2 +123,456,789.00-123,456,789.00 +DROP TABLE t1; +CREATE TABLE t1 (t VARCHAR(32) CHARSET latin1); +INSERT INTO t1 VALUES('abcdefghi'); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT INSERT(t,3,4,'xxx') t2 FROM t1) sub; +c2 +abxxxghi-abxxxghi +DROP TABLE t1; +CREATE TABLE t1 (t VARCHAR(10) CHARSET latin1); +INSERT INTO t1 VALUES('abcdefghi'); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT LEFT(t,10) t2 FROM t1) sub; +c2 +abcdefghi-abcdefghi +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT RIGHT(t,10) t2 FROM t1) sub; +c2 +abcdefghi-abcdefghi +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT SUBSTR(t,1,10) t2 FROM t1) sub; +c2 +abcdefghi-abcdefghi +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT LTRIM(t) t2 FROM t1) sub; +c2 +abcdefghi-abcdefghi +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT RTRIM(t) t2 FROM t1) sub; +c2 +abcdefghi-abcdefghi +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT TRIM(t) t2 FROM t1) sub; +c2 +abcdefghi-abcdefghi +DROP TABLE t1; +SET optimizer_switch=@save_optimizer_switch; diff --git a/mysql-test/r/func_crypt.result b/mysql-test/r/func_crypt.result index 1eda56ac114..707e767ddf5 100644 --- a/mysql-test/r/func_crypt.result +++ b/mysql-test/r/func_crypt.result @@ -106,3 +106,21 @@ OLD_PASSWORD(c1) PASSWORD(c1) 77023ffe214c04ff *82E58A2C08AAFE72C8EB523069CD8ADB33F78F58 DROP TABLE t1; End of 5.0 tests +# +# Start of 10.0 tests +# +# +# MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery +# +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch='derived_merge=on'; +CREATE TABLE t1 (t VARCHAR(32) CHARSET latin1); +INSERT INTO t1 VALUES('abcdefghi'); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT ENCRYPT(t,'aa') t2 FROM t1) sub; +c2 +aaHHlPHAM4sjs-aaHHlPHAM4sjs +DROP TABLE t1; +SET optimizer_switch=@save_optimizer_switch; +# +# End of 10.0 tests +# diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 2bd492008bc..f029542e717 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -1641,5 +1641,23 @@ AsText(g) NULL POINT(1 1) # +# MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery +# +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch='derived_merge=on'; +CREATE TABLE t1 (x INT, y INT); +INSERT INTO t1 VALUES(0,0); +SELECT LENGTH(t2) c2 FROM (SELECT ST_BUFFER(POINT(x,y), 0) t2 FROM t1) sub; +c2 +25 +SELECT LENGTH(CONCAT(t2,'-',t2)) c2 FROM (SELECT ST_BUFFER(POINT(x,y), 0) t2 FROM t1) sub; +c2 +51 +SELECT LENGTH(CONCAT(t2,'--',t2)) c2 FROM (SELECT ST_BUFFER(POINT(x,y), 0) t2 FROM t1) sub; +c2 +52 +DROP TABLE t1; +SET optimizer_switch=@save_optimizer_switch; +# # End 10.0 tests # diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test index 165d945944e..04156622ab2 100644 --- a/mysql-test/t/ctype_ucs.test +++ b/mysql-test/t/ctype_ucs.test @@ -923,6 +923,22 @@ SET NAMES utf8, character_set_connection=ucs2; SELECT 'a','aa'; +--echo # +--echo # MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery +--echo # + +SET NAMES utf8, character_set_connection=ucs2; +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch=_utf8'derived_merge=on'; +CREATE TABLE t1 (t VARCHAR(10) CHARSET latin1); +INSERT INTO t1 VALUES('abcdefghi'); +SET NAMES utf8, character_set_connection=ucs2; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT HEX(t) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT TO_BASE64(t) t2 FROM t1) sub; +DROP TABLE t1; +SET optimizer_switch=@save_optimizer_switch; + + --echo # --echo # End of 10.0 tests --echo # diff --git a/mysql-test/t/func_concat.test b/mysql-test/t/func_concat.test index e56d1121808..be573f494a2 100644 --- a/mysql-test/t/func_concat.test +++ b/mysql-test/t/func_concat.test @@ -145,3 +145,94 @@ CALL p1(); DROP PROCEDURE p1; --echo # End of 5.1 tests + + +--echo # +--echo # Start of 10.0 tests +--echo # + +--echo # +--echo # MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery +--echo # + +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch='derived_merge=on'; + +CREATE TABLE t1 (t VARCHAR(10) CHARSET latin1); +INSERT INTO t1 VALUES('1234567'); +SELECT CONCAT(SUBSTR(t2, 1, 3), SUBSTR(t2, 5)) c1, + CONCAT(SUBSTR(t2,1,3),'---',SUBSTR(t2,5)) c2 + FROM (SELECT CONVERT(t USING latin1) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT CONVERT(t USING latin1) t2 FROM t1) sub; +DROP TABLE t1; + +# Other functions affected by MDEV-10306 + +CREATE TABLE t1 (t VARCHAR(10) CHARSET latin1); +INSERT INTO t1 VALUES('1234567'); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT CONVERT(t USING latin1) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT REVERSE(t) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT SOUNDEX(t) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT TO_BASE64(t) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT WEIGHT_STRING(t) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT HEX(t) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT QUOTE(t) t2 FROM t1) sub; +DROP TABLE t1; + +CREATE TABLE t1 (t VARCHAR(32) CHARSET latin1); +INSERT INTO t1 VALUES(TO_BASE64('abcdefghi')); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT FROM_BASE64(t) t2 FROM t1) sub; +DROP TABLE t1; + +CREATE TABLE t1 (t VARCHAR(32) CHARSET latin1); +INSERT INTO t1 VALUES(HEX('abcdefghi')); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT UNHEX(t) t2 FROM t1) sub; +DROP TABLE t1; + +CREATE TABLE t1 (t VARCHAR(30) CHARSET latin1); +INSERT INTO t1 VALUES('test'); +SELECT LENGTH(CONCAT(t2)) c2 FROM (SELECT AES_ENCRYPT(t,'x') t2 FROM t1) sub; +SELECT LENGTH(CONCAT(t2,'-',t2)) c2 FROM (SELECT AES_ENCRYPT(t,'x') t2 FROM t1) sub; +SELECT LENGTH(CONCAT(t2,'--',t2)) c2 FROM (SELECT AES_ENCRYPT(t,'x') t2 FROM t1) sub; +SELECT LENGTH(CONCAT(t2)) c2 FROM (SELECT AES_DECRYPT(AES_ENCRYPT(t,'x'),'x') t2 FROM t1) sub; +SELECT LENGTH(CONCAT(t2,'-',t2)) c2 FROM (SELECT AES_DECRYPT(AES_ENCRYPT(t,'x'),'x') t2 FROM t1) sub; +SELECT LENGTH(CONCAT(t2,'--',t2)) c2 FROM (SELECT AES_DECRYPT(AES_ENCRYPT(t,'x'),'x') t2 FROM t1) sub; +DROP TABLE t1; + + +# Functions not affected by MDEV-10306 +# They only had an unused tmp_value, which was removed. + +CREATE TABLE t1 (t VARCHAR(64) CHARSET latin1); +INSERT INTO t1 VALUES('123456789'); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT MD5(t) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT FORMAT(t,2) t2 FROM t1) sub; +DROP TABLE t1; + +# Functions not affected by MDEV-10306 +# They already use tmp_value only for internal purposes and +# return the result in the String passed to val_str() + +CREATE TABLE t1 (t VARCHAR(32) CHARSET latin1); +INSERT INTO t1 VALUES('abcdefghi'); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT INSERT(t,3,4,'xxx') t2 FROM t1) sub; +DROP TABLE t1; + + +# Functions not affected by MDEV-10306 +# They use this code style: +# String *res= args[0]->val_str(str); +# tmp_value.set(*res, start, end); +# return &tmp_value; + +CREATE TABLE t1 (t VARCHAR(10) CHARSET latin1); +INSERT INTO t1 VALUES('abcdefghi'); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT LEFT(t,10) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT RIGHT(t,10) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT SUBSTR(t,1,10) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT LTRIM(t) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT RTRIM(t) t2 FROM t1) sub; +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT TRIM(t) t2 FROM t1) sub; +DROP TABLE t1; + +SET optimizer_switch=@save_optimizer_switch; diff --git a/mysql-test/t/func_crypt.test b/mysql-test/t/func_crypt.test index ca6e712f45c..785cc63d3f1 100644 --- a/mysql-test/t/func_crypt.test +++ b/mysql-test/t/func_crypt.test @@ -70,3 +70,27 @@ SELECT OLD_PASSWORD(c1), PASSWORD(c1) FROM t1; DROP TABLE t1; --echo End of 5.0 tests + + +--echo # +--echo # Start of 10.0 tests +--echo # + +--echo # +--echo # MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery +--echo # + +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch='derived_merge=on'; +# ENCRYPT() is not affected by MDEV-10306 +# It already uses tmp_value only for internal purposes and +# returns the result in the String passed to val_str() +CREATE TABLE t1 (t VARCHAR(32) CHARSET latin1); +INSERT INTO t1 VALUES('abcdefghi'); +SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT ENCRYPT(t,'aa') t2 FROM t1) sub; +DROP TABLE t1; +SET optimizer_switch=@save_optimizer_switch; + +--echo # +--echo # End of 10.0 tests +--echo # diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index f689902533a..fe7b8ff7383 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -1502,6 +1502,21 @@ DROP VIEW v1; --echo # SELECT AsText(g) FROM (SELECT NULL AS g UNION SELECT Point(1,1)) AS t1; +--echo # +--echo # MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery +--echo # + +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch='derived_merge=on'; +CREATE TABLE t1 (x INT, y INT); +INSERT INTO t1 VALUES(0,0); +SELECT LENGTH(t2) c2 FROM (SELECT ST_BUFFER(POINT(x,y), 0) t2 FROM t1) sub; +SELECT LENGTH(CONCAT(t2,'-',t2)) c2 FROM (SELECT ST_BUFFER(POINT(x,y), 0) t2 FROM t1) sub; +SELECT LENGTH(CONCAT(t2,'--',t2)) c2 FROM (SELECT ST_BUFFER(POINT(x,y), 0) t2 FROM t1) sub; +DROP TABLE t1; +SET optimizer_switch=@save_optimizer_switch; + + --echo # --echo # End 10.0 tests --echo # diff --git a/sql/item.h b/sql/item.h index 28a6649b9b1..f363950b9bc 100644 --- a/sql/item.h +++ b/sql/item.h @@ -830,25 +830,20 @@ public: store return value of this method. NOTE - Buffer passed via argument should only be used if the item itself - doesn't have an own String buffer. In case when the item maintains - it's own string buffer, it's preferable to return it instead to - minimize number of mallocs/memcpys. - The caller of this method can modify returned string, but only in case - when it was allocated on heap, (is_alloced() is true). This allows - the caller to efficiently use a buffer allocated by a child without - having to allocate a buffer of it's own. The buffer, given to - val_str() as argument, belongs to the caller and is later used by the - caller at it's own choosing. - A few implications from the above: - - unless you return a string object which only points to your buffer - but doesn't manages it you should be ready that it will be - modified. - - even for not allocated strings (is_alloced() == false) the caller - can change charset (see Item_func_{typecast/binary}. XXX: is this - a bug? - - still you should try to minimize data copying and return internal - object whenever possible. + The caller can modify the returned String, if it's not marked + "const" (with the String::mark_as_const() method). That means that + if the item returns its own internal buffer (e.g. tmp_value), it + *must* be marked "const" [1]. So normally it's preferrable to + return the result value in the String, that was passed as an + argument. But, for example, SUBSTR() returns a String that simply + points into the buffer of SUBSTR()'s args[0]->val_str(). Such a + String is always "const", so it's ok to use tmp_value for that and + avoid reallocating/copying of the argument String. + + [1] consider SELECT CONCAT(f, ":", f) FROM (SELECT func() AS f); + here the return value of f() is used twice in the top-level + select, and if they share the same tmp_value buffer, modifying the + first one will implicitly modify the second too. RETURN In case of NULL value return 0 (NULL pointer) and set null_value flag diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 568a28e6465..a9e39ab717a 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -1268,7 +1268,7 @@ String *Item_func_buffer::val_str(String *str_value) { DBUG_ENTER("Item_func_buffer::val_str"); DBUG_ASSERT(fixed == 1); - String *obj= args[0]->val_str(&tmp_value); + String *obj= args[0]->val_str(str_value); double dist= args[1]->val_real(); Geometry_buffer buffer; Geometry *g; diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h index 62d2198e221..d32edff599c 100644 --- a/sql/item_geofunc.h +++ b/sql/item_geofunc.h @@ -171,7 +171,6 @@ public: class Item_func_spatial_collection: public Item_geometry_func { - String tmp_value; enum Geometry::wkbType coll_type; enum Geometry::wkbType item_type; public: @@ -325,7 +324,6 @@ protected: Gcalc_result_receiver res_receiver; Gcalc_operation_reducer operation; - String tmp_value; public: Item_func_buffer(Item *obj, Item *distance): diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 08b9ded80f5..f559677051b 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -73,8 +73,14 @@ size_t username_char_length= 80; Conversion happens only in case of "tricky" Item character set (e.g. UCS2). Normally conversion does not happen, and val_str_ascii() is immediately returned instead. + + No matter if conversion is needed or not needed, + the result is always returned in "str" (see MDEV-10306 why). + + @param [OUT] str - Store the result here + @param [IN] ascii_buffer - Use this temporary buffer to call val_str_ascii() */ -String *Item_func::val_str_from_val_str_ascii(String *str, String *str2) +String *Item_func::val_str_from_val_str_ascii(String *str, String *ascii_buffer) { DBUG_ASSERT(fixed == 1); @@ -86,19 +92,19 @@ String *Item_func::val_str_from_val_str_ascii(String *str, String *str2) return res; } - DBUG_ASSERT(str != str2); + DBUG_ASSERT(str != ascii_buffer); uint errors; - String *res= val_str_ascii(str); + String *res= val_str_ascii(ascii_buffer); if (!res) return 0; - if ((null_value= str2->copy(res->ptr(), res->length(), - &my_charset_latin1, collation.collation, - &errors))) + if ((null_value= str->copy(res->ptr(), res->length(), + &my_charset_latin1, collation.collation, + &errors))) return 0; - return str2; + return str; } @@ -368,12 +374,12 @@ void Item_func_sha2::fix_length_and_dec() /* Implementation of AES encryption routines */ -String *Item_func_aes_encrypt::val_str(String *str) +String *Item_func_aes_encrypt::val_str(String *str2) { DBUG_ASSERT(fixed == 1); char key_buff[80]; String tmp_key_value(key_buff, sizeof(key_buff), system_charset_info); - String *sptr= args[0]->val_str(str); // String to encrypt + String *sptr= args[0]->val_str(&str_value); // String to encrypt String *key= args[1]->val_str(&tmp_key_value); // key int aes_length; if (sptr && key) // we need both arguments to be not NULL @@ -381,15 +387,15 @@ String *Item_func_aes_encrypt::val_str(String *str) null_value=0; aes_length=my_aes_get_size(sptr->length()); // Calculate result length - if (!str_value.alloc(aes_length)) // Ensure that memory is free + if (!str2->alloc(aes_length)) // Ensure that memory is free { // finally encrypt directly to allocated buffer. - if (my_aes_encrypt(sptr->ptr(),sptr->length(), (char*) str_value.ptr(), + if (my_aes_encrypt(sptr->ptr(),sptr->length(), (char*) str2->ptr(), key->ptr(), key->length()) == aes_length) { // We got the expected result length - str_value.length((uint) aes_length); - return &str_value; + str2->length((uint) aes_length); + return str2; } } } @@ -412,22 +418,22 @@ String *Item_func_aes_decrypt::val_str(String *str) String *sptr, *key; DBUG_ENTER("Item_func_aes_decrypt::val_str"); - sptr= args[0]->val_str(str); // String to decrypt + sptr= args[0]->val_str(&str_value); // String to decrypt key= args[1]->val_str(&tmp_key_value); // Key if (sptr && key) // Need to have both arguments not NULL { null_value=0; - if (!str_value.alloc(sptr->length())) // Ensure that memory is free + if (!str->alloc(sptr->length())) // Ensure that memory is free { // finally decrypt directly to allocated buffer. int length; length=my_aes_decrypt(sptr->ptr(), sptr->length(), - (char*) str_value.ptr(), + (char*) str->ptr(), key->ptr(), key->length()); if (length >= 0) // if we got correct data data { - str_value.length((uint) length); - DBUG_RETURN(&str_value); + str->length((uint) length); + DBUG_RETURN(str); } } } @@ -464,7 +470,7 @@ void Item_func_to_base64::fix_length_and_dec() String *Item_func_to_base64::val_str_ascii(String *str) { - String *res= args[0]->val_str(str); + String *res= args[0]->val_str(&tmp_value); bool too_long= false; int length; if (!res || @@ -472,7 +478,7 @@ String *Item_func_to_base64::val_str_ascii(String *str) (too_long= ((uint) (length= base64_needed_encoded_length((int) res->length())) > current_thd->variables.max_allowed_packet)) || - tmp_value.alloc((uint) length)) + str->alloc((uint) length)) { null_value= 1; // NULL input, too long input, or OOM. if (too_long) @@ -484,11 +490,11 @@ String *Item_func_to_base64::val_str_ascii(String *str) } return 0; } - base64_encode(res->ptr(), (int) res->length(), (char*) tmp_value.ptr()); + base64_encode(res->ptr(), (int) res->length(), (char*) str->ptr()); DBUG_ASSERT(length > 0); - tmp_value.length((uint) length - 1); // Without trailing '\0' + str->length((uint) length - 1); // Without trailing '\0' null_value= 0; - return &tmp_value; + return str; } @@ -509,7 +515,7 @@ void Item_func_from_base64::fix_length_and_dec() String *Item_func_from_base64::val_str(String *str) { - String *res= args[0]->val_str_ascii(str); + String *res= args[0]->val_str_ascii(&tmp_value); int length; const char *end_ptr; @@ -527,11 +533,11 @@ String *Item_func_from_base64::val_str(String *str) goto err; } - if (tmp_value.alloc((uint) length)) + if (str->alloc((uint) length)) goto err; if ((length= base64_decode(res->ptr(), (int) res->length(), - (char *) tmp_value.ptr(), &end_ptr, 0)) < 0 || + (char *) str->ptr(), &end_ptr, 0)) < 0 || end_ptr < res->ptr() + res->length()) { push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN, @@ -540,9 +546,9 @@ String *Item_func_from_base64::val_str(String *str) goto err; } - tmp_value.length((uint) length); + str->length((uint) length); null_value= 0; - return &tmp_value; + return str; err: null_value= 1; // NULL input, too long input, OOM, or badly formed input return 0; @@ -797,7 +803,7 @@ String *Item_func_des_encrypt::val_str(String *str) struct st_des_keyschedule keyschedule; const char *append_str="********"; uint key_number, res_length, tail; - String *res= args[0]->val_str(str); + String *res= args[0]->val_str(&tmp_value); if ((null_value= args[0]->null_value)) return 0; // ENCRYPT(NULL) == NULL @@ -821,7 +827,7 @@ String *Item_func_des_encrypt::val_str(String *str) } else { - String *keystr=args[1]->val_str(&tmp_value); + String *keystr= args[1]->val_str(str); if (!keystr) goto error; key_number=127; // User key string @@ -853,23 +859,23 @@ String *Item_func_des_encrypt::val_str(String *str) tmp_arg.length(0); tmp_arg.append(res->ptr(), res->length()); code= ER_OUT_OF_RESOURCES; - if (tmp_arg.append(append_str, tail) || tmp_value.alloc(res_length+1)) + if (tmp_arg.append(append_str, tail) || str->alloc(res_length+1)) goto error; tmp_arg[res_length-1]=tail; // save extra length - tmp_value.realloc(res_length+1); - tmp_value.length(res_length+1); - tmp_value.set_charset(&my_charset_bin); - tmp_value[0]=(char) (128 | key_number); + str->realloc(res_length+1); + str->length(res_length+1); + str->set_charset(&my_charset_bin); + (*str)[0]=(char) (128 | key_number); // Real encryption bzero((char*) &ivec,sizeof(ivec)); DES_ede3_cbc_encrypt((const uchar*) (tmp_arg.ptr()), - (uchar*) (tmp_value.ptr()+1), + (uchar*) (str->ptr()+1), res_length, &keyschedule.ks1, &keyschedule.ks2, &keyschedule.ks3, &ivec, TRUE); - return &tmp_value; + return str; error: push_warning_printf(current_thd,Sql_condition::WARN_LEVEL_WARN, @@ -893,7 +899,7 @@ String *Item_func_des_decrypt::val_str(String *str) DES_cblock ivec; struct st_des_keyblock keyblock; struct st_des_keyschedule keyschedule; - String *res= args[0]->val_str(str); + String *res= args[0]->val_str(&tmp_value); uint length,tail; if ((null_value= args[0]->null_value)) @@ -917,7 +923,7 @@ String *Item_func_des_decrypt::val_str(String *str) else { // We make good 24-byte (168 bit) key from given plaintext key with MD5 - String *keystr=args[1]->val_str(&tmp_value); + String *keystr= args[1]->val_str(str); if (!keystr) goto error; @@ -932,23 +938,23 @@ String *Item_func_des_decrypt::val_str(String *str) DES_set_key_unchecked(&keyblock.key3,&keyschedule.ks3); } code= ER_OUT_OF_RESOURCES; - if (tmp_value.alloc(length-1)) + if (str->alloc(length-1)) goto error; bzero((char*) &ivec,sizeof(ivec)); DES_ede3_cbc_encrypt((const uchar*) res->ptr()+1, - (uchar*) (tmp_value.ptr()), + (uchar*) (str->ptr()), length-1, &keyschedule.ks1, &keyschedule.ks2, &keyschedule.ks3, &ivec, FALSE); /* Restore old length of key */ - if ((tail=(uint) (uchar) tmp_value[length-2]) > 8) + if ((tail=(uint) (uchar) (*str)[length-2]) > 8) goto wrong_key; // Wrong key - tmp_value.length(length-1-tail); - tmp_value.set_charset(&my_charset_bin); - return &tmp_value; + str->length(length-1-tail); + str->set_charset(&my_charset_bin); + return str; error: push_warning_printf(current_thd,Sql_condition::WARN_LEVEL_WARN, @@ -1136,25 +1142,26 @@ void Item_func_concat_ws::fix_length_and_dec() String *Item_func_reverse::val_str(String *str) { DBUG_ASSERT(fixed == 1); - String *res = args[0]->val_str(str); - char *ptr, *end, *tmp; + String *res= args[0]->val_str(&tmp_value); + const char *ptr, *end; + char *tmp; if ((null_value=args[0]->null_value)) return 0; /* An empty string is a special case as the string pointer may be null */ if (!res->length()) return make_empty_result(); - if (tmp_value.alloced_length() < res->length() && - tmp_value.realloc(res->length())) + if (str->alloced_length() < res->length() && + str->realloc(res->length())) { null_value= 1; return 0; } - tmp_value.length(res->length()); - tmp_value.set_charset(res->charset()); - ptr= (char *) res->ptr(); - end= ptr + res->length(); - tmp= (char *) tmp_value.ptr() + tmp_value.length(); + str->length(res->length()); + str->set_charset(res->charset()); + ptr= res->ptr(); + end= res->end(); + tmp= (char *) str->end(); #ifdef USE_MB if (use_mb(res->charset())) { @@ -1178,7 +1185,7 @@ String *Item_func_reverse::val_str(String *str) while (ptr < end) *--tmp= *ptr++; } - return &tmp_value; + return str; } @@ -2446,7 +2453,6 @@ void Item_func_soundex::fix_length_and_dec() DBUG_ASSERT(collation.collation != NULL); set_if_bigger(char_length, 4); fix_char_length(char_length); - tmp_value.set_charset(collation.collation); } @@ -2491,7 +2497,7 @@ static bool my_uni_isalpha(int wc) String *Item_func_soundex::val_str(String *str) { DBUG_ASSERT(fixed == 1); - String *res =args[0]->val_str(str); + String *res= args[0]->val_str(&tmp_value); char last_ch,ch; CHARSET_INFO *cs= collation.collation; my_wc_t wc; @@ -2501,10 +2507,11 @@ String *Item_func_soundex::val_str(String *str) if ((null_value= args[0]->null_value)) return 0; /* purecov: inspected */ - if (tmp_value.alloc(MY_MAX(res->length(), 4 * cs->mbminlen))) - return str; /* purecov: inspected */ - char *to= (char *) tmp_value.ptr(); - char *to_end= to + tmp_value.alloced_length(); + if (str->alloc(MY_MAX(res->length(), 4 * cs->mbminlen))) + return &tmp_value; /* purecov: inspected */ + str->set_charset(collation.collation); + char *to= (char *) str->ptr(); + char *to_end= to + str->alloced_length(); char *from= (char *) res->ptr(), *end= from + res->length(); for ( ; ; ) /* Skip pre-space */ @@ -2589,8 +2596,8 @@ String *Item_func_soundex::val_str(String *str) to+= nbytes; } - tmp_value.length((uint) (to-tmp_value.ptr())); - return &tmp_value; + str->length((uint) (to - str->ptr())); + return str; } @@ -3399,16 +3406,16 @@ String *Item_func_conv_charset::val_str(String *str) DBUG_ASSERT(fixed == 1); if (use_cached_value) return null_value ? 0 : &str_value; - String *arg= args[0]->val_str(str); + String *arg= args[0]->val_str(&tmp_value); uint dummy_errors; if (args[0]->null_value) { null_value=1; return 0; } - null_value= tmp_value.copy(arg->ptr(), arg->length(), arg->charset(), - conv_charset, &dummy_errors); - return null_value ? 0 : check_well_formed_result(&tmp_value); + null_value= str->copy(arg->ptr(), arg->length(), arg->charset(), + conv_charset, &dummy_errors); + return null_value ? 0 : check_well_formed_result(str); } void Item_func_conv_charset::fix_length_and_dec() @@ -3551,7 +3558,7 @@ String *Item_func_weight_string::val_str(String *str) DBUG_ASSERT(fixed == 1); if (args[0]->result_type() != STRING_RESULT || - !(res= args[0]->val_str(str))) + !(res= args[0]->val_str(&tmp_value))) goto nl; /* @@ -3598,19 +3605,19 @@ String *Item_func_weight_string::val_str(String *str) goto nl; } - if (tmp_value.alloc(tmp_length)) + if (str->alloc(tmp_length)) goto nl; frm_length= cs->coll->strnxfrm(cs, - (uchar *) tmp_value.ptr(), tmp_length, + (uchar *) str->ptr(), tmp_length, nweights ? nweights : tmp_length, (const uchar *) res->ptr(), res->length(), flags); DBUG_ASSERT(frm_length <= tmp_length); - tmp_value.length(frm_length); + str->length(frm_length); null_value= 0; - return &tmp_value; + return str; nl: null_value= 1; @@ -3651,18 +3658,18 @@ String *Item_func_hex::val_str_ascii(String *str) } /* Convert given string to a hex string, character by character */ - res= args[0]->val_str(str); - if (!res || tmp_value.alloc(res->length()*2+1)) + res= args[0]->val_str(&tmp_value); + if (!res || str->alloc(res->length()*2+1)) { null_value=1; return 0; } null_value=0; - tmp_value.length(res->length()*2); - tmp_value.set_charset(&my_charset_latin1); + str->length(res->length()*2); + str->set_charset(&my_charset_latin1); - octet2hex((char*) tmp_value.ptr(), res->ptr(), res->length()); - return &tmp_value; + octet2hex((char*) str->ptr(), res->ptr(), res->length()); + return str; } /** Convert given hex string to a binary string. */ @@ -3675,8 +3682,8 @@ String *Item_func_unhex::val_str(String *str) uint length; DBUG_ASSERT(fixed == 1); - res= args[0]->val_str(str); - if (!res || tmp_value.alloc(length= (1+res->length())/2)) + res= args[0]->val_str(&tmp_value); + if (!res || str->alloc(length= (1+res->length())/2)) { null_value=1; return 0; @@ -3684,8 +3691,8 @@ String *Item_func_unhex::val_str(String *str) from= res->ptr(); null_value= 0; - tmp_value.length(length); - to= (char*) tmp_value.ptr(); + str->length(length); + to= (char*) str->ptr(); if (res->length() % 2) { int hex_char; @@ -3703,7 +3710,7 @@ String *Item_func_unhex::val_str(String *str) if ((null_value= (hex_char == -1))) return 0; } - return &tmp_value; + return str; } @@ -3949,7 +3956,7 @@ String *Item_func_quote::val_str(String *str) ulong max_allowed_packet= current_thd->variables.max_allowed_packet; char *from, *to, *end, *start; - String *arg= args[0]->val_str(str); + String *arg= args[0]->val_str(&tmp_value); uint arg_length, new_length; if (!arg) // Null argument { @@ -3976,7 +3983,7 @@ String *Item_func_quote::val_str(String *str) set_if_smaller(new_length, max_allowed_packet); } - if (tmp_value.alloc(new_length)) + if (str->alloc(new_length)) goto null; if (collation.collation->mbmaxlen > 1) @@ -3984,7 +3991,7 @@ String *Item_func_quote::val_str(String *str) CHARSET_INFO *cs= collation.collation; int mblen; uchar *to_end; - to= (char*) tmp_value.ptr(); + to= (char*) str->ptr(); to_end= (uchar*) to + new_length; /* Put leading quote */ @@ -4021,14 +4028,14 @@ String *Item_func_quote::val_str(String *str) if ((mblen= cs->cset->wc_mb(cs, '\'', (uchar *) to, to_end)) <= 0) goto toolong; to+= mblen; - new_length= to - tmp_value.ptr(); + new_length= to - str->ptr(); goto ret; } /* We replace characters from the end to the beginning */ - to= (char*) tmp_value.ptr() + new_length - 1; + to= (char*) str->ptr() + new_length - 1; *to--= '\''; for (start= (char*) arg->ptr(),end= start + arg_length; end-- != start; to--) { @@ -4058,10 +4065,10 @@ String *Item_func_quote::val_str(String *str) *to= '\''; ret: - tmp_value.length(new_length); - tmp_value.set_charset(collation.collation); + str->length(new_length); + str->set_charset(collation.collation); null_value= 0; - return &tmp_value; + return str; toolong: push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN, @@ -4134,7 +4141,7 @@ String *Item_func_compress::val_str(String *str) char *tmp, *last_char; DBUG_ASSERT(fixed == 1); - if (!(res= args[0]->val_str(str))) + if (!(res= args[0]->val_str(&tmp_value))) { null_value= 1; return 0; @@ -4155,13 +4162,13 @@ String *Item_func_compress::val_str(String *str) // Check new_size overflow: new_size <= res->length() if (((uint32) (new_size+5) <= res->length()) || - buffer.realloc((uint32) new_size + 4 + 1)) + str->realloc((uint32) new_size + 4 + 1)) { null_value= 1; return 0; } - body= ((Byte*)buffer.ptr()) + 4; + body= ((Byte*)str->ptr()) + 4; // As far as we have checked res->is_empty() we can use ptr() if ((err= my_compress_buffer(body, &new_size, (const uchar *)res->ptr(), @@ -4173,7 +4180,7 @@ String *Item_func_compress::val_str(String *str) return 0; } - tmp= (char*)buffer.ptr(); // int4store is a macro; avoid side effects + tmp= (char*) str->ptr(); // int4store is a macro; avoid side effects int4store(tmp, res->length() & 0x3FFFFFFF); /* This is to ensure that things works for CHAR fields, which trim ' ': */ @@ -4184,15 +4191,15 @@ String *Item_func_compress::val_str(String *str) new_size++; } - buffer.length((uint32)new_size + 4); - return &buffer; + str->length((uint32)new_size + 4); + return str; } String *Item_func_uncompress::val_str(String *str) { DBUG_ASSERT(fixed == 1); - String *res= args[0]->val_str(str); + String *res= args[0]->val_str(&tmp_value); ulong new_size; int err; uint code; @@ -4223,14 +4230,14 @@ String *Item_func_uncompress::val_str(String *str) max_allowed_packet)); goto err; } - if (buffer.realloc((uint32)new_size)) + if (str->realloc((uint32)new_size)) goto err; - if ((err= uncompress((Byte*)buffer.ptr(), &new_size, + if ((err= uncompress((Byte*)str->ptr(), &new_size, ((const Bytef*)res->ptr())+4,res->length()-4)) == Z_OK) { - buffer.length((uint32) new_size); - return &buffer; + str->length((uint32) new_size); + return str; } code= ((err == Z_BUF_ERROR) ? ER_ZLIB_Z_BUF_ERROR : diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 78989e9f517..769bde67cb1 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -87,7 +87,6 @@ public: class Item_func_md5 :public Item_str_ascii_func { - String tmp_value; public: Item_func_md5(Item *a) :Item_str_ascii_func(a) {} String *val_str_ascii(String *); @@ -167,7 +166,6 @@ public: class Item_func_decode_histogram :public Item_str_func { - String tmp_value; public: Item_func_decode_histogram(Item *a, Item *b) :Item_str_func(a, b) {} @@ -675,7 +673,6 @@ public: class Item_func_format :public Item_str_ascii_func { - String tmp_str; MY_LOCALE *locale; public: Item_func_format(Item *org, Item *dec): Item_str_ascii_func(org, dec) {} @@ -729,7 +726,6 @@ public: class Item_func_binlog_gtid_pos :public Item_str_func { - String tmp_value; public: Item_func_binlog_gtid_pos(Item *arg1,Item *arg2) :Item_str_func(arg1,arg2) {} String *val_str(String *); @@ -1106,7 +1102,7 @@ public: class Item_func_compress: public Item_str_func { - String buffer; + String tmp_value; public: Item_func_compress(Item *a):Item_str_func(a){} void fix_length_and_dec(){max_length= (args[0]->max_length*120)/100+12;} @@ -1116,7 +1112,7 @@ public: class Item_func_uncompress: public Item_str_func { - String buffer; + String tmp_value; public: Item_func_uncompress(Item *a): Item_str_func(a){} void fix_length_and_dec(){ maybe_null= 1; max_length= MAX_BLOB_WIDTH; } From 5e4f4ec8211b61e71ec29069161d0f41f4c05376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 19 Jun 2017 15:59:19 +0300 Subject: [PATCH 018/102] MDEV-12975 InnoDB redo log minimum size check uses detected file size instead of requested innodb_log_file_size log_calc_max_ages(): Use the requested size in the check, instead of the detected redo log size. The redo log will be resized at startup if it differs from what has been requested. --- mysql-test/suite/innodb/t/log_file_size.test | 8 +- storage/innobase/log/log0log.cc | 95 +++++++------------- storage/xtradb/log/log0log.cc | 95 +++++++------------- 3 files changed, 71 insertions(+), 127 deletions(-) diff --git a/mysql-test/suite/innodb/t/log_file_size.test b/mysql-test/suite/innodb/t/log_file_size.test index 4bae93957e8..6c1003881cf 100644 --- a/mysql-test/suite/innodb/t/log_file_size.test +++ b/mysql-test/suite/innodb/t/log_file_size.test @@ -1,6 +1,6 @@ # Test resizing the InnoDB redo log. ---source include/have_innodb.inc +--source include/innodb_page_size.inc # Embedded server does not support crashing --source include/not_embedded.inc @@ -37,6 +37,12 @@ call mtr.add_suppression("Attempting backtrace"); FLUSH TABLES; --enable_query_log +--let $restart_parameters= --innodb-thread-concurrency=1 --innodb-log-file-size=1m --innodb-log-files-in-group=2 +--source include/restart_mysqld.inc + +--let $restart_parameters= --innodb-thread-concurrency=100 --innodb-log-file-size=10M --innodb-log-files-in-group=2 +--source include/restart_mysqld.inc + CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB; BEGIN; INSERT INTO t1 VALUES (42); diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 65981829f16..2b4bcb628f1 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -734,43 +734,16 @@ ibool log_calc_max_ages(void) /*===================*/ { - log_group_t* group; lsn_t margin; ulint free; - ibool success = TRUE; - lsn_t smallest_capacity; - lsn_t archive_margin; - lsn_t smallest_archive_margin; - mutex_enter(&(log_sys->mutex)); - - group = UT_LIST_GET_FIRST(log_sys->log_groups); - - ut_ad(group); - - smallest_capacity = LSN_MAX; - smallest_archive_margin = LSN_MAX; - - while (group) { - if (log_group_get_capacity(group) < smallest_capacity) { - - smallest_capacity = log_group_get_capacity(group); - } - - archive_margin = log_group_get_capacity(group) - - (group->file_size - LOG_FILE_HDR_SIZE) - - LOG_ARCHIVE_EXTRA_MARGIN; - - if (archive_margin < smallest_archive_margin) { - - smallest_archive_margin = archive_margin; - } - - group = UT_LIST_GET_NEXT(log_groups, group); - } + lsn_t smallest_capacity = ((srv_log_file_size_requested + << srv_page_size_shift) + - LOG_FILE_HDR_SIZE) + * srv_n_log_files; /* Add extra safety */ - smallest_capacity = smallest_capacity - smallest_capacity / 10; + smallest_capacity -= smallest_capacity / 10; /* For each OS thread we must reserve so much free space in the smallest log group that it can accommodate the log entries produced @@ -780,36 +753,6 @@ log_calc_max_ages(void) free = LOG_CHECKPOINT_FREE_PER_THREAD * (10 + srv_thread_concurrency) + LOG_CHECKPOINT_EXTRA_FREE; if (free >= smallest_capacity / 2) { - success = FALSE; - - goto failure; - } else { - margin = smallest_capacity - free; - } - - margin = margin - margin / 10; /* Add still some extra safety */ - - log_sys->log_group_capacity = smallest_capacity; - - log_sys->max_modified_age_async = margin - - margin / LOG_POOL_PREFLUSH_RATIO_ASYNC; - log_sys->max_modified_age_sync = margin - - margin / LOG_POOL_PREFLUSH_RATIO_SYNC; - - log_sys->max_checkpoint_age_async = margin - margin - / LOG_POOL_CHECKPOINT_RATIO_ASYNC; - log_sys->max_checkpoint_age = margin; - -#ifdef UNIV_LOG_ARCHIVE - log_sys->max_archived_lsn_age = smallest_archive_margin; - - log_sys->max_archived_lsn_age_async = smallest_archive_margin - - smallest_archive_margin / LOG_ARCHIVE_RATIO_ASYNC; -#endif /* UNIV_LOG_ARCHIVE */ -failure: - mutex_exit(&(log_sys->mutex)); - - if (!success) { fprintf(stderr, "InnoDB: Error: ib_logfiles are too small" " for innodb_thread_concurrency %lu.\n" @@ -829,8 +772,34 @@ failure: exit(1); } + margin = smallest_capacity - free; + margin = margin - margin / 10; /* Add still some extra safety */ - return(success); + mutex_enter(&log_sys->mutex); + + log_sys->log_group_capacity = smallest_capacity; + + log_sys->max_modified_age_async = margin + - margin / LOG_POOL_PREFLUSH_RATIO_ASYNC; + log_sys->max_modified_age_sync = margin + - margin / LOG_POOL_PREFLUSH_RATIO_SYNC; + + log_sys->max_checkpoint_age_async = margin - margin + / LOG_POOL_CHECKPOINT_RATIO_ASYNC; + log_sys->max_checkpoint_age = margin; + +#ifdef UNIV_LOG_ARCHIVE + lsn_t archive_margin = smallest_capacity + - (srv_log_file_size_requested - LOG_FILE_HDR_SIZE) + - LOG_ARCHIVE_EXTRA_MARGIN; + log_sys->max_archived_lsn_age = archive_margin; + + log_sys->max_archived_lsn_age_async = archive_margin + - archive_margin / LOG_ARCHIVE_RATIO_ASYNC; +#endif /* UNIV_LOG_ARCHIVE */ + mutex_exit(&log_sys->mutex); + + return(true); } /******************************************************//** diff --git a/storage/xtradb/log/log0log.cc b/storage/xtradb/log/log0log.cc index 47261aa633a..211cde3cc7a 100644 --- a/storage/xtradb/log/log0log.cc +++ b/storage/xtradb/log/log0log.cc @@ -839,43 +839,16 @@ ibool log_calc_max_ages(void) /*===================*/ { - log_group_t* group; lsn_t margin; ulint free; - ibool success = TRUE; - lsn_t smallest_capacity; - lsn_t archive_margin; - lsn_t smallest_archive_margin; - mutex_enter(&(log_sys->mutex)); - - group = UT_LIST_GET_FIRST(log_sys->log_groups); - - ut_ad(group); - - smallest_capacity = LSN_MAX; - smallest_archive_margin = LSN_MAX; - - while (group) { - if (log_group_get_capacity(group) < smallest_capacity) { - - smallest_capacity = log_group_get_capacity(group); - } - - archive_margin = log_group_get_capacity(group) - - (group->file_size - LOG_FILE_HDR_SIZE) - - LOG_ARCHIVE_EXTRA_MARGIN; - - if (archive_margin < smallest_archive_margin) { - - smallest_archive_margin = archive_margin; - } - - group = UT_LIST_GET_NEXT(log_groups, group); - } + lsn_t smallest_capacity = ((srv_log_file_size_requested + << srv_page_size_shift) + - LOG_FILE_HDR_SIZE) + * srv_n_log_files; /* Add extra safety */ - smallest_capacity = smallest_capacity - smallest_capacity / 10; + smallest_capacity -= smallest_capacity / 10; /* For each OS thread we must reserve so much free space in the smallest log group that it can accommodate the log entries produced @@ -885,36 +858,6 @@ log_calc_max_ages(void) free = LOG_CHECKPOINT_FREE_PER_THREAD * (10 + srv_thread_concurrency) + LOG_CHECKPOINT_EXTRA_FREE; if (free >= smallest_capacity / 2) { - success = FALSE; - - goto failure; - } else { - margin = smallest_capacity - free; - } - - margin = margin - margin / 10; /* Add still some extra safety */ - - log_sys->log_group_capacity = smallest_capacity; - - log_sys->max_modified_age_async = margin - - margin / LOG_POOL_PREFLUSH_RATIO_ASYNC; - log_sys->max_modified_age_sync = margin - - margin / LOG_POOL_PREFLUSH_RATIO_SYNC; - - log_sys->max_checkpoint_age_async = margin - margin - / LOG_POOL_CHECKPOINT_RATIO_ASYNC; - log_sys->max_checkpoint_age = margin; - -#ifdef UNIV_LOG_ARCHIVE - log_sys->max_archived_lsn_age = smallest_archive_margin; - - log_sys->max_archived_lsn_age_async = smallest_archive_margin - - smallest_archive_margin / LOG_ARCHIVE_RATIO_ASYNC; -#endif /* UNIV_LOG_ARCHIVE */ -failure: - mutex_exit(&(log_sys->mutex)); - - if (!success) { fprintf(stderr, "InnoDB: Error: ib_logfiles are too small" " for innodb_thread_concurrency %lu.\n" @@ -934,8 +877,34 @@ failure: exit(1); } + margin = smallest_capacity - free; + margin = margin - margin / 10; /* Add still some extra safety */ - return(success); + mutex_enter(&log_sys->mutex); + + log_sys->log_group_capacity = smallest_capacity; + + log_sys->max_modified_age_async = margin + - margin / LOG_POOL_PREFLUSH_RATIO_ASYNC; + log_sys->max_modified_age_sync = margin + - margin / LOG_POOL_PREFLUSH_RATIO_SYNC; + + log_sys->max_checkpoint_age_async = margin - margin + / LOG_POOL_CHECKPOINT_RATIO_ASYNC; + log_sys->max_checkpoint_age = margin; + +#ifdef UNIV_LOG_ARCHIVE + lsn_t archive_margin = smallest_capacity + - (srv_log_file_size_requested - LOG_FILE_HDR_SIZE) + - LOG_ARCHIVE_EXTRA_MARGIN; + log_sys->max_archived_lsn_age = archive_margin; + + log_sys->max_archived_lsn_age_async = archive_margin + - archive_margin / LOG_ARCHIVE_RATIO_ASYNC; +#endif /* UNIV_LOG_ARCHIVE */ + mutex_exit(&log_sys->mutex); + + return(true); } /******************************************************//** From ded614d7dbc930e373d1a69a0d2a7e4bf0a2c6d3 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 14 Jun 2017 13:44:31 +0200 Subject: [PATCH 019/102] MDEV-12778 mariadb-10.1 FTBFS on GNU/Hurd due to use of PATH_MAX --- mysys/my_symlink.c | 2 +- mysys/mysys_priv.h | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mysys/my_symlink.c b/mysys/my_symlink.c index ed35fff41e9..12959f1f24a 100644 --- a/mysys/my_symlink.c +++ b/mysys/my_symlink.c @@ -197,7 +197,7 @@ int my_realpath(char *to, const char *filename, myf MyFlags) const char *my_open_parent_dir_nosymlinks(const char *pathname, int *pdfd) { - char buf[PATH_MAX+1]; + char buf[FN_REFLEN + 1]; char *s= buf, *e= buf+1, *end= strnmov(buf, pathname, sizeof(buf)); int fd, dfd= -1; diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index 661c4c184f1..1004bf8889f 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -107,12 +107,21 @@ const char *my_open_parent_dir_nosymlinks(const char *pathname, int *pdfd); res= AT; \ if (dfd >= 0) close(dfd); \ return res; -#elif defined(HAVE_REALPATH) +#elif defined(HAVE_REALPATH) && defined(PATH_MAX) #define NOSYMLINK_FUNCTION_BODY(AT,NOAT) \ char buf[PATH_MAX+1]; \ if (realpath(pathname, buf) == NULL) return -1; \ if (strcmp(pathname, buf)) { errno= ENOTDIR; return -1; } \ return NOAT; +#elif defined(HAVE_REALPATH) +#define NOSYMLINK_FUNCTION_BODY(AT,NOAT) \ + char *buf= realpath(pathname, NULL); \ + int res; \ + if (buf == NULL) return -1; \ + if (strcmp(pathname, buf)) { errno= ENOTDIR; res= -1; } \ + else res= NOAT; \ + free(buf); \ + return res; #else #define NOSYMLINK_FUNCTION_BODY(AT,NOAT) \ return NOAT; From b9a326b6e1c1a4b14b27e7fb634fb5f16981f731 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 19 Jun 2017 17:00:09 +0000 Subject: [PATCH 020/102] MDEV-12709 : mariabackup - during backup phase read some innodb parameter using "show variables", rather than take the value from my.cnf. "show variables" is more accurate than my.cnf,it also works for parameters set on the mysqld command line, which is especially important for MTR. --- extra/mariabackup/backup_mysql.cc | 37 +++++++++++++------------------ 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 2353c7692cb..00fed457304 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -344,7 +344,8 @@ get_mysql_vars(MYSQL *connection) char *innodb_data_home_dir_var = NULL; char *innodb_undo_directory_var = NULL; char *innodb_page_size_var = NULL; - + char *innodb_undo_tablespaces_var = NULL; + char *endptr; unsigned long server_version = mysql_get_server_version(connection); bool ret = true; @@ -372,6 +373,7 @@ get_mysql_vars(MYSQL *connection) {"innodb_data_home_dir", &innodb_data_home_dir_var}, {"innodb_undo_directory", &innodb_undo_directory_var}, {"innodb_page_size", &innodb_page_size_var}, + {"innodb_undo_tablespaces", &innodb_undo_tablespaces_var}, {NULL, NULL} }; @@ -460,62 +462,55 @@ get_mysql_vars(MYSQL *connection) } /* get some default values is they are missing from my.cnf */ - if (!check_if_param_set("datadir") && datadir_var && *datadir_var) { + if (datadir_var && *datadir_var) { strmake(mysql_real_data_home, datadir_var, FN_REFLEN - 1); mysql_data_home= mysql_real_data_home; } - if (!check_if_param_set("innodb_data_file_path") - && innodb_data_file_path_var && *innodb_data_file_path_var) { + if (innodb_data_file_path_var && *innodb_data_file_path_var) { innobase_data_file_path = my_strdup( innodb_data_file_path_var, MYF(MY_FAE)); } - if (!check_if_param_set("innodb_data_home_dir") - && innodb_data_home_dir_var && *innodb_data_home_dir_var) { + if (innodb_data_home_dir_var && *innodb_data_home_dir_var) { innobase_data_home_dir = my_strdup( innodb_data_home_dir_var, MYF(MY_FAE)); } - if (!check_if_param_set("innodb_log_group_home_dir") - && innodb_log_group_home_dir_var + if (innodb_log_group_home_dir_var && *innodb_log_group_home_dir_var) { srv_log_group_home_dir = my_strdup( innodb_log_group_home_dir_var, MYF(MY_FAE)); } - if (!check_if_param_set("innodb_undo_directory") - && innodb_undo_directory_var && *innodb_undo_directory_var) { + if (innodb_undo_directory_var && *innodb_undo_directory_var) { srv_undo_dir = my_strdup( innodb_undo_directory_var, MYF(MY_FAE)); } - if (!check_if_param_set("innodb_log_files_in_group") - && innodb_log_files_in_group_var) { - char *endptr; - + if (innodb_log_files_in_group_var) { innobase_log_files_in_group = strtol( innodb_log_files_in_group_var, &endptr, 10); ut_ad(*endptr == 0); } - if (!check_if_param_set("innodb_log_file_size") - && innodb_log_file_size_var) { - char *endptr; - + if (innodb_log_file_size_var) { innobase_log_file_size = strtoll( innodb_log_file_size_var, &endptr, 10); ut_ad(*endptr == 0); } - if (!check_if_param_set("innodb_page_size") && innodb_page_size_var) { - char *endptr; - + if (innodb_page_size_var) { innobase_page_size = strtoll( innodb_page_size_var, &endptr, 10); ut_ad(*endptr == 0); } + if (innodb_undo_tablespaces_var) { + srv_undo_tablespaces = strtoul(innodb_undo_tablespaces_var, &endptr, 10); + ut_ad(*endptr == 0); + } + out: free_mysql_variables(mysql_vars); From 472c2d9b2fbb262665bdd08338ea902e8398010d Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 19 Jun 2017 18:23:55 +0000 Subject: [PATCH 021/102] MDEV-13106 : Fix check for empty directory in MSI installer --- win/packaging/ca/CustomAction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp index 9a174b8529e..9281ce27d34 100644 --- a/win/packaging/ca/CustomAction.cpp +++ b/win/packaging/ca/CustomAction.cpp @@ -180,7 +180,7 @@ extern "C" UINT __stdcall CheckDirectoryEmpty(MSIHANDLE hInstall, empty= true; for(;;) { - if (wcscmp(data.cFileName, L".") || wcscmp(data.cFileName, L"..")) + if (wcscmp(data.cFileName, L".") && wcscmp(data.cFileName, L"..")) { empty= false; break; From e333d8296480afc63962892f6c8e101dfcaa2686 Mon Sep 17 00:00:00 2001 From: Sachin Setiya Date: Thu, 22 Jun 2017 11:38:50 +0530 Subject: [PATCH 022/102] MDEV-12398 All cluster nodes stop due to a foreign key constraint failure Comment from Codership:- To fix the problem, we changed the certification logic in galera to treat insert on child table row as exclusive to prevent any operation on referenced parent table row. At the same time, update and delete on child table row were demoted to "shared", which makes it possible to update/delete referenced parent table row, but only in a later transaction. This change allows somewhat more concurrency for foreign key constrained transactions, but is still safe for correct certification end result. --- mysql-test/suite/galera/r/MW-369.result | 155 +++++++++++++++ mysql-test/suite/galera/t/MW-369.inc | 75 +++++++ mysql-test/suite/galera/t/MW-369.test | 247 ++++++++++++++++++++++++ storage/innobase/row/row0ins.cc | 21 +- storage/xtradb/row/row0ins.cc | 19 +- 5 files changed, 502 insertions(+), 15 deletions(-) create mode 100644 mysql-test/suite/galera/r/MW-369.result create mode 100644 mysql-test/suite/galera/t/MW-369.inc create mode 100644 mysql-test/suite/galera/t/MW-369.test diff --git a/mysql-test/suite/galera/r/MW-369.result b/mysql-test/suite/galera/r/MW-369.result new file mode 100644 index 00000000000..516904d1b2a --- /dev/null +++ b/mysql-test/suite/galera/r/MW-369.result @@ -0,0 +1,155 @@ +CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB; +CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, +CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1)) ; +INSERT INTO p VALUES (1, 0); +INSERT INTO p VALUES (2, 0); +SET AUTOCOMMIT=ON; +START TRANSACTION; +DELETE FROM p WHERE f1 = 1; +SET SESSION wsrep_sync_wait = 0; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +INSERT INTO c VALUES (1, 1); +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync'; +COMMIT; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync'; +SET GLOBAL wsrep_provider_options = 'dbug='; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT * FROM p; +f1 f2 +1 0 +2 0 +SELECT * FROM c; +f1 p_id +1 1 +DROP TABLE c; +DROP TABLE p; +CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB; +CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, +f2 INTEGER, +CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1)) ; +INSERT INTO p VALUES (1, 0); +INSERT INTO p VALUES (2, 0); +INSERT INTO c VALUES (1, 1, 0); +SET AUTOCOMMIT=ON; +START TRANSACTION; +UPDATE p SET f2 = 1 WHERE f1 = 1; +SET SESSION wsrep_sync_wait = 0; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +UPDATE c SET f2 = 1 WHERE f1 = 1; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync'; +COMMIT; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync'; +SET GLOBAL wsrep_provider_options = 'dbug='; +SELECT * FROM p; +f1 f2 +1 1 +2 0 +SELECT * FROM c; +f1 p_id f2 +1 1 1 +DROP TABLE c; +DROP TABLE p; +CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB; +CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, +CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1)) ; +INSERT INTO p VALUES (1, 0); +INSERT INTO p VALUES (2, 0); +INSERT INTO c VALUES (1, 1); +SET AUTOCOMMIT=ON; +START TRANSACTION; +UPDATE p SET f2 = 1 WHERE f1 = 1; +SET SESSION wsrep_sync_wait = 0; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +DELETE FROM c WHERE f1 = 1; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync'; +COMMIT; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync'; +SET GLOBAL wsrep_provider_options = 'dbug='; +SELECT * FROM p; +f1 f2 +1 1 +2 0 +SELECT * FROM c; +f1 p_id +DROP TABLE c; +DROP TABLE p; +CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER UNIQUE KEY) ENGINE=INNODB; +CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, +CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f2)) ; +INSERT INTO p VALUES (1, 0); +SET AUTOCOMMIT=ON; +START TRANSACTION; +UPDATE p SET f2 = 1 WHERE f1 = 1; +SET SESSION wsrep_sync_wait = 0; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +INSERT INTO c VALUES (1, 0);; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync'; +COMMIT; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync'; +SET GLOBAL wsrep_provider_options = 'dbug='; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT * FROM p; +f1 f2 +1 0 +SELECT * FROM c; +f1 p_id +1 0 +DROP TABLE c; +DROP TABLE p; +CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB; +CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, f2 INTEGER, +CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1) +ON DELETE CASCADE) ; +INSERT INTO p VALUES (1, 0); +INSERT INTO p VALUES (2, 0); +INSERT INTO c VALUES (1, 1, 0); +SET AUTOCOMMIT=ON; +START TRANSACTION; +DELETE FROM p WHERE f1 = 1; +SET SESSION wsrep_sync_wait = 0; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +UPDATE c SET f2 = 1 WHERE f1 = 1; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync'; +COMMIT; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync'; +SET GLOBAL wsrep_provider_options = 'dbug='; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT * FROM p; +f1 f2 +1 0 +2 0 +SELECT * FROM c; +f1 p_id f2 +1 1 1 +DROP TABLE c; +DROP TABLE p; diff --git a/mysql-test/suite/galera/t/MW-369.inc b/mysql-test/suite/galera/t/MW-369.inc new file mode 100644 index 00000000000..5fd9ef150ae --- /dev/null +++ b/mysql-test/suite/galera/t/MW-369.inc @@ -0,0 +1,75 @@ +# +# This file should be included from tests for MW-369 to run concurrent +# transaction from node_1 with autocommit query from node_2. +# +# The parameters: +# * $mw_369_parent_query - the parent query to be run inside transaction +# * $mw_369_child_query - the child query +# +# The operations are the following: +# +# node_1: +# START TRANSACTION; +# $mw_369_parent_query +# node_2 +# $mw_369_child_query - will be blocked on node_1 in apply monitor +# node_1: +# COMMIT; - will be blocked on node_1 in local monitor +# +# The $mw_369_child_query is always expected to succeed. The caller is +# responsible for checking if the final COMMIT on connection node_1 +# succeeds. +# + +--connection node_1 +SET AUTOCOMMIT=ON; +START TRANSACTION; + +--eval $mw_369_parent_query + +# +# Block the $mw_369_child_query from node_2 +# +# --connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1 +--connection node_1a +SET SESSION wsrep_sync_wait = 0; +--let $galera_sync_point = apply_monitor_slave_enter_sync +--source include/galera_set_sync_point.inc + +# +# insert client row, which will make it impossible to replay the +# delete on parent +# +--connection node_2 +--eval $mw_369_child_query + +# +# Wait until $mw_369_child_query from node_2 reaches the sync point and +# block the 'COMMIT' from node_1 before it certifies. +# +--connection node_1a +--source include/galera_wait_sync_point.inc +--source include/galera_clear_sync_point.inc + +--let $galera_sync_point = local_monitor_enter_sync +--source include/galera_set_sync_point.inc + +--connection node_1 +--send COMMIT + +# +# Wait until both sync points have been reached +# +--connection node_1a +--let $galera_sync_point = apply_monitor_slave_enter_sync local_monitor_enter_sync +--source include/galera_wait_sync_point.inc + +# +# both threads are now parked in sync points, signal them to continue +# +--let $galera_sync_point = apply_monitor_slave_enter_sync +--source include/galera_signal_sync_point.inc + +--let $galera_sync_point = local_monitor_enter_sync +--source include/galera_signal_sync_point.inc +--source include/galera_clear_sync_point.inc diff --git a/mysql-test/suite/galera/t/MW-369.test b/mysql-test/suite/galera/t/MW-369.test new file mode 100644 index 00000000000..bfb9460b411 --- /dev/null +++ b/mysql-test/suite/galera/t/MW-369.test @@ -0,0 +1,247 @@ +# +# Test A Outline: +# =============== +# +# This test tests the scenario for MW-369 where a new child table +# row referring to parent table row is inserted concurrently from +# another node while the transaction which tries to delete a +# referred row from the parent table is committing. +# +# The p table will originally have rows (1, 0), (2, 0). +# The c table will be empty. +# +# A new row (1, 1) pointing to parent row (1, 0) is inserted from +# connection node_2, the transaction which tries to remove the +# parent row (1, 0) is run from connection node_1. +# +# Expected outcome: +# ================ +# +# The transaction on node_1 will fail. The parent table will contain +# rows (1, 0), (2, 0) and the child table will contain row (1, 1). +# + +--source include/galera_cluster.inc +--source include/have_innodb.inc +--source include/have_debug_sync.inc +--source suite/galera/include/galera_have_debug_sync.inc + +CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB; +CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, + CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1)) ; + +INSERT INTO p VALUES (1, 0); +INSERT INTO p VALUES (2, 0); + +--let $mw_369_parent_query = DELETE FROM p WHERE f1 = 1 +--let $mw_369_child_query = INSERT INTO c VALUES (1, 1) + +# +# we must open connection node_1a here, MW-369.inc will use it later +# +--connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1 +--source MW-369.inc + +# Commit fails +--connection node_1 +--error ER_LOCK_DEADLOCK +--reap + +--connection node_2 +SELECT * FROM p; +SELECT * FROM c; + +DROP TABLE c; +DROP TABLE p; + +# +# Test B Outline: +# =============== +# +# This test tests the scenario for MW-369 where a existing +# child table row is updated concurrently from another node +# with a transaction which updates the parent table. +# +# The p table will originally have rows (1, 0), (2, 0). +# The c table will originally have rows (1, 1, 0) which points +# to parent table row (1, 0). +# +# Expected outcome: +# ================ +# +# Both updates should succeed since they are done to separate tables and +# rows. The parent table will contain rows (1, 1), (2, 0). The child +# table will contain row (1, 1, 1). +# + +--connection node_1 +CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB; +CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, + f2 INTEGER, + CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1)) ; + +INSERT INTO p VALUES (1, 0); +INSERT INTO p VALUES (2, 0); +INSERT INTO c VALUES (1, 1, 0); + +--let mw_369_parent_query = UPDATE p SET f2 = 1 WHERE f1 = 1 +--let $mw_369_child_query = UPDATE c SET f2 = 1 WHERE f1 = 1 +--source MW-369.inc + +# Commit succeeds +--connection node_1 +--reap + +--connection node_2 +SELECT * FROM p; +SELECT * FROM c; + +DROP TABLE c; +DROP TABLE p; + +# +# Test C Outline: +# =============== +# +# This test tests the scenario for MW-369 where a child table row is +# deleted concurrently from the other node while a transaction updates +# the parent table referred by the child table row. +# +# The p table will originally have rows (1, 0), (2, 0) +# The c table will originally have row (1, 1) which points to parent +# table row (1, 0). +# +# A row (1, 1) pointing to parent row (1, 0) is deleted from +# connection node_2, the transaction which tries to update the +# parent row (1, 0) is run from connection node_1. +# +# Expected Outcome: +# ================ +# Both operations on node_1 and node_2 should succeed without conflicts. +# The parent table should contain values (1, 1), (2, 0) and the child +# table should be empty. + +--connection node_1 +CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB; +CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, + CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1)) ; + +INSERT INTO p VALUES (1, 0); +INSERT INTO p VALUES (2, 0); +INSERT INTO c VALUES (1, 1); + +--let $mw_369_parent_query = UPDATE p SET f2 = 1 WHERE f1 = 1 +--let $mw_369_child_query = DELETE FROM c WHERE f1 = 1 +--source MW-369.inc + +# Commit succeeds +--connection node_1 +--reap + +--connection node_2 +SELECT * FROM p; +SELECT * FROM c; + +DROP TABLE c; +DROP TABLE p; + + +# +# Test D Outline: +# =============== +# +# This test is similar to test A, where parent row is deleted while a child row +# is inserted simultaneously on node 2. However, in this test case the FK +# constraint's target column is a unique key, and parent row is not delete, +# but this key value is changed so that insert on node 2 will cause FK +# violation +# +# The p table will originally have rows (1, 0) +# The c table will originally be empty +# +# in node_1, parent row is updated to value (1,1) +# A row (1, 0) pointing to the old version of parent row (1, 0) is inserted +# in connection node_2 +# +# Expected Outcome: +# ================ +# This is a true conflict and one transaciton must abort. In this case it is node_1 +# transaction, which was scheduled later. +# Parent table should have row (1,0) +# child table should have row (1,0) +# + +CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER UNIQUE KEY) ENGINE=INNODB; +CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, + CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f2)) ; + +INSERT INTO p VALUES (1, 0); + +--let $mw_369_parent_query = UPDATE p SET f2 = 1 WHERE f1 = 1 +--let $mw_369_child_query = INSERT INTO c VALUES (1, 0); +--source MW-369.inc + +# Commit fails +--connection node_1 +--error ER_LOCK_DEADLOCK +--reap + +--connection node_2 +SELECT * FROM p; +SELECT * FROM c; + +DROP TABLE c; +DROP TABLE p; + +# +# Test E Outline: +# =============== +# +# This test is similar to test B, where parent row is deleted while a child row +# is updated simultaneously on node 2. However, in this test case the FK +# constraint has ON DELETE CASCADE option, and the delete on parent row will +# cascade a delete on child row as well. This will cause true conflict with +# connection node_2, which tries to update unrelated column on child table. +# +# The p table will originally have rows (1, 0), (2,0) +# The c table will originally have row (1,1,0) +# +# in node_1, parent row (1,0) is deleted and cascaded delete will happen on +# child table row (1,1,0). +# in connection node_2 child table row is update to value (1,1,1) +# +# Expected Outcome: +# ================ +# This is a true conflict and one transaciton must abort. In this case it is node_1 +# transaction, which was scheduled later. +# Parent table should have rows (1,0), (2,0) +# child table should have row (1,1,1) +# + + +CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB; +CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, f2 INTEGER, + CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1) + ON DELETE CASCADE) ; + +INSERT INTO p VALUES (1, 0); +INSERT INTO p VALUES (2, 0); +INSERT INTO c VALUES (1, 1, 0); + +--let $mw_369_parent_query = DELETE FROM p WHERE f1 = 1 +--let $mw_369_child_query = UPDATE c SET f2 = 1 WHERE f1 = 1 +--source MW-369.inc + +# Commit fails +--connection node_1 +--error ER_LOCK_DEADLOCK +--reap + +--connection node_2 +SELECT * FROM p; +SELECT * FROM c; + +DROP TABLE c; +DROP TABLE p; + +--sleep 3 diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 5ded12c2c34..c9d616cfb2a 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -1290,11 +1290,12 @@ row_ins_foreign_check_on_constraint( #ifdef WITH_WSREP err = wsrep_append_foreign_key( - thr_get_trx(thr), - foreign, - clust_rec, - clust_index, - FALSE, FALSE); + thr_get_trx(thr), + foreign, + clust_rec, + clust_index, + FALSE, + (node) ? TRUE : FALSE); if (err != DB_SUCCESS) { fprintf(stderr, "WSREP: foreign key append failed: %d\n", err); @@ -1455,6 +1456,9 @@ row_ins_check_foreign_constraint( ulint* offsets = offsets_; rec_offs_init(offsets_); +#ifdef WITH_WSREP + upd_node= NULL; +#endif /* WITH_WSREP */ run_again: #ifdef UNIV_SYNC_DEBUG ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_SHARED)); @@ -1638,9 +1642,10 @@ run_again: err = wsrep_append_foreign_key( thr_get_trx(thr), foreign, - rec, - check_index, - check_ref, TRUE); + rec, + check_index, + check_ref, + (upd_node) ? TRUE : FALSE); #endif /* WITH_WSREP */ goto end_scan; } else if (foreign->type != 0) { diff --git a/storage/xtradb/row/row0ins.cc b/storage/xtradb/row/row0ins.cc index 6072b303d3a..00b8ce17b26 100644 --- a/storage/xtradb/row/row0ins.cc +++ b/storage/xtradb/row/row0ins.cc @@ -1296,11 +1296,12 @@ row_ins_foreign_check_on_constraint( #ifdef WITH_WSREP err = wsrep_append_foreign_key( - thr_get_trx(thr), - foreign, - clust_rec, - clust_index, - FALSE, FALSE); + thr_get_trx(thr), + foreign, + clust_rec, + clust_index, + FALSE, + (node) ? TRUE : FALSE); if (err != DB_SUCCESS) { fprintf(stderr, "WSREP: foreign key append failed: %d\n", err); @@ -1461,6 +1462,9 @@ row_ins_check_foreign_constraint( ulint* offsets = offsets_; rec_offs_init(offsets_); +#ifdef WITH_WSREP + upd_node= NULL; +#endif /* WITH_WSREP */ run_again: #ifdef UNIV_SYNC_DEBUG ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_SHARED)); @@ -1651,8 +1655,9 @@ run_again: thr_get_trx(thr), foreign, rec, - check_index, - check_ref, TRUE); + check_index, + check_ref, + (upd_node) ? TRUE : FALSE); #endif /* WITH_WSREP */ goto end_scan; } else if (foreign->type != 0) { From d4007f2e73e3ad2676c3f766b233e96f21874c7d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 4 May 2017 17:18:45 +0200 Subject: [PATCH 023/102] disable getopt prefix matching in mtr bootstrap it was disabled in mtr tests in 4280b25ed8 --- mysql-test/mysql-test-run.pl | 1 + mysql-test/r/mysqld--help.result | 2 +- .../suite/perfschema/r/bad_option_2.result | 2 +- .../suite/perfschema/t/bad_option_2.test | 25 +++---------------- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 64483fa50f1..ff929f8a2e8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3105,6 +3105,7 @@ sub mysql_install_db { my $args; mtr_init_args(\$args); mtr_add_arg($args, "--no-defaults"); + mtr_add_arg($args, "--disable-getopt-prefix-matching"); mtr_add_arg($args, "--bootstrap"); mtr_add_arg($args, "--basedir=%s", $install_basedir); mtr_add_arg($args, "--datadir=%s", $install_datadir); diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 4b9370f2cd4..3b49f334557 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1200,7 +1200,7 @@ ft-query-expansion-limit 20 ft-stopword-file (No default value) gdb FALSE general-log FALSE -getopt-prefix-matching TRUE +getopt-prefix-matching FALSE group-concat-max-len 1024 gtid-domain-id 0 gtid-ignore-duplicates FALSE diff --git a/mysql-test/suite/perfschema/r/bad_option_2.result b/mysql-test/suite/perfschema/r/bad_option_2.result index d8fda2af3b6..b8fd2ff9a3c 100644 --- a/mysql-test/suite/perfschema/r/bad_option_2.result +++ b/mysql-test/suite/perfschema/r/bad_option_2.result @@ -1 +1 @@ -Found: ambiguous option '--performance-schema-max_=12' +FOUND /ambiguous option '--performance-schema-max_=12'/ in bad_option_2.txt diff --git a/mysql-test/suite/perfschema/t/bad_option_2.test b/mysql-test/suite/perfschema/t/bad_option_2.test index 175767bb9f2..ce3e5c3243b 100644 --- a/mysql-test/suite/perfschema/t/bad_option_2.test +++ b/mysql-test/suite/perfschema/t/bad_option_2.test @@ -8,26 +8,9 @@ let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_2.txt; --error 0,1 --remove_file $outfile --error 3 ---exec $MYSQLD_BOOTSTRAP_CMD --loose-console --performance-schema-max_=12 > $outfile 2>&1 - -perl; - use strict; - use warnings; - my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/bad_option_2.txt"; - open(FILE, "<", $fname) or die; - my @lines= ; - # those must be in the file for the test to pass - my @patterns= - ("ambiguous option '--performance-schema-max_=12'"); - foreach my $one_line (@lines) - { - foreach my $one_pattern (@patterns) - { - # print pattern, not line, to get a stable output - print "Found: $one_pattern\n" if ($one_line =~ /$one_pattern/); - } - } - close FILE; -EOF +--exec $MYSQLD_BOOTSTRAP_CMD --loose-console --enable-getopt-prefix-matching --performance-schema-max_=12 > $outfile 2>&1 +--let SEARCH_PATTERN=ambiguous option '--performance-schema-max_=12' +--let SEARCH_FILE=$outfile +--source include/search_pattern_in_file.inc --remove_file $outfile From d937916c064d46076f5cec2280d91870ed7576d4 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 14 Jun 2017 20:21:24 +0200 Subject: [PATCH 024/102] MDEV-12193 Discontinue support of unsecure and unsupported OpenSSL versions (< 1.0.1) --- cmake/ssl.cmake | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index b699a3b493f..74d61b582ea 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -167,6 +167,20 @@ MACRO (MYSQL_CHECK_SSL) SET(CMAKE_REQUIRED_INCLUDES) IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES AND CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH) + # Verify version number. Version information looks like: + # #define OPENSSL_VERSION_NUMBER 0x1000103fL + # Encoded as MNNFFPPS: major minor fix patch status + FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" + OPENSSL_VERSION_NUMBER + REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" + ) + STRING(REGEX REPLACE + "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" + OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" + ) + MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}") + ENDIF() + IF(OPENSSL_MAJOR_VERSION GREATER 0) SET(SSL_SOURCES "") SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY}) IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") @@ -176,22 +190,9 @@ MACRO (MYSQL_CHECK_SSL) SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBDL}) ENDIF() - # Verify version number. Version information looks like: - # #define OPENSSL_VERSION_NUMBER 0x1000103fL - # Encoded as MNNFFPPS: major minor fix patch status - FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" - OPENSSL_VERSION_NUMBER - REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" - ) - STRING(REGEX REPLACE - "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" - OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" - ) - MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}") MESSAGE(STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}") MESSAGE(STATUS "CRYPTO_LIBRARY = ${CRYPTO_LIBRARY}") - MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}") MESSAGE(STATUS "SSL_LIBRARIES = ${SSL_LIBRARIES}") SET(SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR}) SET(SSL_INTERNAL_INCLUDE_DIRS "") From b6ce68f450ce06db989febf4dc3e2428d6400dd7 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 15 Jun 2017 20:16:18 +0200 Subject: [PATCH 025/102] MDEV-13012 Assertion `share->error' failed in discover_handlerton upon executing statement with max_session_mem_used = 8192 and MDEV-13011 Server crashes in THD::handle_condition or Assertion `! is_set() || m_can_overwrite_status' fails upon attempt to connect with max_session_mem_used = 8192 errors when a connection is killed in the * TABLE_SHARE::init_from_sql_statement_string() * THD::init() also, safety-wise, don't check max_mem_used on free() and when some error was already issued. --- mysql-test/r/errors.result | 4 ++++ mysql-test/t/errors.test | 9 +++++++++ sql/handler.cc | 7 ++++++- sql/mysqld.cc | 8 +++++--- sql/sql_class.cc | 2 +- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result index 23c77d3978c..bf75bf73862 100644 --- a/mysql-test/r/errors.result +++ b/mysql-test/r/errors.result @@ -168,3 +168,7 @@ UPDATE t1 SET a = 'new' WHERE COLUMN_CREATE( 1, 'v', 1, 'w' ) IS NULL; ERROR 22007: Illegal value used as argument of dynamic column function drop table t1; +set max_session_mem_used = 8192; +select * from seq_1_to_1000; +ERROR HY000: Engine SEQUENCE failed to discover table `test`.`seq_1_to_1000` with 'create table seq (seq bigint unsigned primary key)' +set global max_session_mem_used = default; diff --git a/mysql-test/t/errors.test b/mysql-test/t/errors.test index 6ce6e439919..9d5cbef89b1 100644 --- a/mysql-test/t/errors.test +++ b/mysql-test/t/errors.test @@ -1,6 +1,7 @@ # # Test some error conditions # +--source include/have_sequence.inc --disable_warnings drop table if exists t1; @@ -198,3 +199,11 @@ CREATE TABLE t1 (a CHAR(3), b BLOB); UPDATE t1 SET a = 'new' WHERE COLUMN_CREATE( 1, 'v', 1, 'w' ) IS NULL; drop table t1; + +# +# errors caused by max_session_mem_used +# +set max_session_mem_used = 8192; +--error ER_SQL_DISCOVER_ERROR +select * from seq_1_to_1000; +set global max_session_mem_used = default; diff --git a/sql/handler.cc b/sql/handler.cc index aa87da5dd44..dae47668410 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -4857,7 +4857,12 @@ static my_bool discover_handlerton(THD *thd, plugin_ref plugin, { if (error) { - DBUG_ASSERT(share->error); // tdc_lock_share needs that + if (!share->error) + { + share->error= OPEN_FRM_ERROR_ALREADY_ISSUED; + plugin_unlock(0, share->db_plugin); + } + /* report an error, unless it is "generic" and a more specific one was already reported diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1e6ee4decbe..17172207613 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3939,8 +3939,9 @@ static void my_malloc_size_cb_func(long long size, my_bool is_thread_specific) (longlong) thd->status_var.local_memory_used, size)); thd->status_var.local_memory_used+= size; - if (thd->status_var.local_memory_used > (int64)thd->variables.max_mem_used && - !thd->killed) + if (size > 0 && + thd->status_var.local_memory_used > (int64)thd->variables.max_mem_used && + !thd->killed && !thd->get_stmt_da()->is_set()) { char buf[1024]; thd->killed= KILL_QUERY; @@ -6646,11 +6647,12 @@ void handle_connections_sockets() */ DBUG_PRINT("info", ("Creating THD for new connection")); - if (!(thd= new THD)) + if (!(thd= new THD) || thd->is_error()) { (void) mysql_socket_shutdown(new_sock, SHUT_RDWR); (void) mysql_socket_close(new_sock); statistic_increment(connection_errors_internal, &LOCK_status); + delete thd; continue; } /* Set to get io buffers to be part of THD */ diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 304036a67ff..6fb74d6e14c 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -879,6 +879,7 @@ THD::THD(bool is_wsrep_applier) debug_sync_control(0), #endif /* defined(ENABLED_DEBUG_SYNC) */ wait_for_commit_ptr(0), + m_internal_handler(0), main_da(0, false, false), m_stmt_da(&main_da), tdc_hash_pins(0), @@ -1073,7 +1074,6 @@ THD::THD(bool is_wsrep_applier) MYF(MY_WME|MY_THREAD_SPECIFIC)); } - m_internal_handler= NULL; m_binlog_invoker= INVOKER_NONE; memset(&invoker_user, 0, sizeof(invoker_user)); memset(&invoker_host, 0, sizeof(invoker_host)); From 3f240bff80b51458c85cd8a8b5616872f21fa033 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 16 Jun 2017 00:35:57 +0200 Subject: [PATCH 026/102] MDEV-13097 Online alter of a partitioned MyISAM table with auto_increment MyISAM only allows online alter if autoincrement didn't change. MyISAM detects that by comparing new autoinc value from create_info, with the old one, stored in MYI. But in partitioned tables, create_info->auto_increment_value is for the whole table, max of autoinc values of individual MYI partitions. So *some* MYI partitions will inevitably think that alter table changes auto_increment value and will deny online alter. Fix: only compare autoinc values, if the user has used AUTO_INCREMENT in the ALTER TABLE statement. --- mysql-test/r/partition_alter.result | 20 ++++++++++++++++++++ mysql-test/t/partition_alter.test | 9 +++++++++ storage/myisam/ha_myisam.cc | 3 ++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/partition_alter.result b/mysql-test/r/partition_alter.result index 4aea0045617..4275ef72f24 100644 --- a/mysql-test/r/partition_alter.result +++ b/mysql-test/r/partition_alter.result @@ -92,3 +92,23 @@ t1 CREATE TABLE `t1` ( PARTITION p2 VALUES LESS THAN ('2020-10-19') ENGINE = MyISAM) */ insert t1 values (2, '2020-01-03', 20); drop table t1; +create table t1 (id_1 int auto_increment, id_2 int, id_3 int, d1 date, dt1 datetime default current_timestamp, dt2 datetime default current_timestamp on update current_timestamp, primary key (id_2, id_3), key(id_1)) partition by hash(id_2) partitions 3 (partition p01, partition p02, partition p03); +insert into t1 values(0, 1, 1, NULL, now(), now()); +alter online table t1 delay_key_write=1; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `id_1` int(11) NOT NULL AUTO_INCREMENT, + `id_2` int(11) NOT NULL, + `id_3` int(11) NOT NULL, + `d1` date DEFAULT NULL, + `dt1` datetime DEFAULT CURRENT_TIMESTAMP, + `dt2` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id_2`,`id_3`), + KEY `id_1` (`id_1`) +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 +/*!50100 PARTITION BY HASH (id_2) +(PARTITION p01 ENGINE = MyISAM, + PARTITION p02 ENGINE = MyISAM, + PARTITION p03 ENGINE = MyISAM) */ +drop table t1; diff --git a/mysql-test/t/partition_alter.test b/mysql-test/t/partition_alter.test index 2f3c2a319fb..feb792624ab 100644 --- a/mysql-test/t/partition_alter.test +++ b/mysql-test/t/partition_alter.test @@ -103,3 +103,12 @@ show create table t1; insert t1 values (2, '2020-01-03', 20); drop table t1; --list_files $datadir/test + +# +# MDEV-13097 Online alter of a partitioned MyISAM table with auto_increment +# +create table t1 (id_1 int auto_increment, id_2 int, id_3 int, d1 date, dt1 datetime default current_timestamp, dt2 datetime default current_timestamp on update current_timestamp, primary key (id_2, id_3), key(id_1)) partition by hash(id_2) partitions 3 (partition p01, partition p02, partition p03); +insert into t1 values(0, 1, 1, NULL, now(), now()); +alter online table t1 delay_key_write=1; +show create table t1; +drop table t1; diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index b335d360379..82bcbdb12a9 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -2266,7 +2266,8 @@ bool ha_myisam::check_if_incompatible_data(HA_CREATE_INFO *create_info, { uint options= table->s->db_options_in_use; - if (create_info->auto_increment_value != stats.auto_increment_value || + if ((create_info->used_fields & HA_CREATE_USED_AUTO && + create_info->auto_increment_value != stats.auto_increment_value) || create_info->data_file_name != data_file_name || create_info->index_file_name != index_file_name || table_changes == IS_EQUAL_NO || From f1a6d24af3f78ffd4441522b7352ab36f37b6b24 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 21 Jun 2017 23:29:19 +0200 Subject: [PATCH 027/102] MDEV-11003 ndb test suite still exists and does not work fix a merge mistake --- .../suite/ndb/r/ndb_restore_discover.result | 33 --------- .../suite/ndb/t/ndb_restore_discover.test | 70 ------------------- 2 files changed, 103 deletions(-) delete mode 100644 mysql-test/suite/ndb/r/ndb_restore_discover.result delete mode 100644 mysql-test/suite/ndb/t/ndb_restore_discover.test diff --git a/mysql-test/suite/ndb/r/ndb_restore_discover.result b/mysql-test/suite/ndb/r/ndb_restore_discover.result deleted file mode 100644 index de10af87047..00000000000 --- a/mysql-test/suite/ndb/r/ndb_restore_discover.result +++ /dev/null @@ -1,33 +0,0 @@ -# -# 18075170 - sql node restart required to avoid deadlock after -# restore -# -CREATE TABLE t1 (id INT) ENGINE=NDBCluster; -CREATE TABLE t2 (id INT) ENGINE=NDBCluster; -INSERT INTO t1 VALUES (1); -INSERT INTO t2 VALUES (1); -DROP TABLE t1; -DROP TABLE t2; -SET autocommit = 0; -SELECT * FROM t1; -id -1 -SELECT * FROM t2; -id -1 -ROLLBACK; -SET autocommit = 1; -drop table t1; -drop table t2; -SET autocommit = 0; -SELECT * FROM t1; -id -1 -SELECT * FROM t2; -id -1 -ALTER TABLE t1 ADD val INT; -ROLLBACK; -SET autocommit = 1; -drop table t1; -drop table t2; diff --git a/mysql-test/suite/ndb/t/ndb_restore_discover.test b/mysql-test/suite/ndb/t/ndb_restore_discover.test deleted file mode 100644 index 6631c74d5c8..00000000000 --- a/mysql-test/suite/ndb/t/ndb_restore_discover.test +++ /dev/null @@ -1,70 +0,0 @@ --- source include/have_ndb.inc --- source include/count_sessions.inc - ---echo # ---echo # 18075170 - sql node restart required to avoid deadlock after ---echo # restore ---echo # -# Test Auto Discover option within a transaction -# and make sure the transaction is not broken. -CREATE TABLE t1 (id INT) ENGINE=NDBCluster; -CREATE TABLE t2 (id INT) ENGINE=NDBCluster; - -INSERT INTO t1 VALUES (1); -INSERT INTO t2 VALUES (1); - --- source include/ndb_backup.inc - -DROP TABLE t1; -DROP TABLE t2; - --- source include/ndb_restore_master.inc - -SET autocommit = 0; -SELECT * FROM t1; - -# Without fix below select was resulting in DEADLOCK error. With fix select -# should succeed. -SELECT * FROM t2; -ROLLBACK; -SET autocommit = 1; - -drop table t1; -drop table t2; - -# -# Checking lock preservation in transaction -# -# Using existing backup to create the scenario. Tables are deleted as part of -# above test cleanup. Thus restoring the backup will bring the system to -# required state. --- source include/ndb_restore_master.inc - -SET autocommit = 0; -SELECT * FROM t1; -SELECT * FROM t2; - -connect(con2, localhost, root); ---SEND ALTER TABLE t1 ADD val INT - -connection default; -# Alter from con2 will be in waiting state as there is a lock on t1 from -# default connection due to active transaction. We check for this condition -# then releasing the lock by rollbacking active transaction. -let $wait_condition= - SELECT count(*) = 1 FROM information_schema.processlist WHERE state - LIKE "Waiting%" AND info = "ALTER TABLE t1 ADD val INT"; ---source include/wait_condition.inc -ROLLBACK; -SET autocommit = 1; - -connection con2; ---REAP - -disconnect con2; -connection default; -drop table t1; -drop table t2; - -# Wait till all disconnects are completed --- source include/wait_until_count_sessions.inc From ba9daddcd831e04be59bf1d60cb666624642f07c Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 20 Jun 2017 20:02:20 +0000 Subject: [PATCH 028/102] Cherrypick Perconas fix for leaking descriptors with new xbstream. https://github.com/percona/percona-xtrabackup/pull/368/commits/72c55f4fc2ba9ede7b960eceb01261ccc339c041 --- extra/mariabackup/xbstream.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extra/mariabackup/xbstream.c b/extra/mariabackup/xbstream.c index edfe20a9e3c..f3880f9ec03 100644 --- a/extra/mariabackup/xbstream.c +++ b/extra/mariabackup/xbstream.c @@ -444,7 +444,11 @@ extract_worker_thread_func(void *arg) } if (chunk.type == XB_CHUNK_TYPE_EOF) { + pthread_mutex_lock(ctxt->mutex); pthread_mutex_unlock(&entry->mutex); + my_hash_delete(ctxt->filehash, (uchar *) entry); + pthread_mutex_unlock(ctxt->mutex); + continue; } From 9b7afd4188dfe5db64fbf8a58360b09f90f77fed Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Fri, 16 Jun 2017 16:24:36 +0200 Subject: [PATCH 029/102] MDEV-12819 order by ordering expression changed to empty string when creatin view with union prepare of "fake_select" for union made in JOIN::prepare only if we do not execute it then before reset, i.e it was for PS prepare and now required for CREATE VIEW to make global ORDER BY which belongs to "fake_select" prepared. --- mysql-test/r/view.result | 18 ++++++++++++++++++ mysql-test/t/view.test | 21 +++++++++++++++++++++ sql/sql_union.cc | 4 +++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index d7cf89577eb..0ded1dd4cb3 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -6065,5 +6065,23 @@ three COUNT(*) drop view v1; drop table t1; # +# MDEV-12819: order by ordering expression changed to empty string +# when creatin view with union +# +create table t1 (t1col1 int, t1col2 int,t1col3 int ); +create table t2 (t2col1 int, t2col2 int, t2col3 int); +create view v1 as +select t1col1,t1col2,t1col3 from t1 +union all +select t2col1,t2col2,t2col3 from t2 +order by 2,3; +show create view v1; +View Create View character_set_client collation_connection +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`t1col1` AS `t1col1`,`t1`.`t1col2` AS `t1col2`,`t1`.`t1col3` AS `t1col3` from `t1` union all select `t2`.`t2col1` AS `t2col1`,`t2`.`t2col2` AS `t2col2`,`t2`.`t2col3` AS `t2col3` from `t2` order by 2,3 latin1 latin1_swedish_ci +select * from v1; +t1col1 t1col2 t1col3 +drop view v1; +drop table t1,t2; +# # End of 10.1 tests # diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index 7a935838216..3ad7b9483ac 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -5900,6 +5900,27 @@ SELECT * FROM v1; drop view v1; drop table t1; +--echo # +--echo # MDEV-12819: order by ordering expression changed to empty string +--echo # when creatin view with union +--echo # + +create table t1 (t1col1 int, t1col2 int,t1col3 int ); +create table t2 (t2col1 int, t2col2 int, t2col3 int); + +create view v1 as +select t1col1,t1col2,t1col3 from t1 +union all +select t2col1,t2col2,t2col3 from t2 +order by 2,3; + +show create view v1; + +select * from v1; + +drop view v1; +drop table t1,t2; + --echo # --echo # End of 10.1 tests --echo # diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 2086d1d6c03..7ca0a9bb867 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -618,7 +618,9 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, if (saved_error) goto err; - if (fake_select_lex != NULL && thd->stmt_arena->is_stmt_prepare()) + if (fake_select_lex != NULL && + (thd->stmt_arena->is_stmt_prepare() || + (thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW))) { /* Validate the global parameters of this union */ From f65d6a03f0870fbac0ce99bc948b28963e594ff3 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Thu, 22 Jun 2017 19:28:07 +0000 Subject: [PATCH 030/102] workaround for a test failure on windows (by serg) --- mysql-test/r/mysqld--help.result | 1 + mysql-test/t/mysqld--help.test | 1 + 2 files changed, 2 insertions(+) diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 3b49f334557..af96555645b 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1,3 +1,4 @@ +Windows bug: happens when a new line is exactly at the right offset The following options may be given as the first argument: --print-defaults Print the program argument list and exit. --no-defaults Don't read default options from any option file. diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test index c8fb5e5b953..00d0b58bd05 100644 --- a/mysql-test/t/mysqld--help.test +++ b/mysql-test/t/mysqld--help.test @@ -42,6 +42,7 @@ perl; $re2=join('|', @plugins); $skip=0; open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help.txt") or die; + print "Windows bug: happens when a new line is exactly at the right offset\n"; while () { next if 1../The following groups are read/; # formatting, skip line consisting entirely of dashes and blanks From b76b69cd5fe634d8ddb9406aa2c82ef2a375b4d8 Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Tue, 20 Jun 2017 14:55:30 +0200 Subject: [PATCH 031/102] MDEV-10880: Assertions `keypart_map' or `prebuilt->search_tuple->n_fields > 0' fail on DISTINCT and GROUP BY constant add_group_and_distinct_keys() should take into account JOIN::simple_group. --- mysql-test/r/bench_count_distinct.result | 2 +- mysql-test/r/distinct.result | 2 +- mysql-test/r/explain_json.result | 18 ++++---- mysql-test/r/group_min_max.result | 46 +++++++++---------- mysql-test/r/order_by.result | 16 +++++++ .../suite/vcol/r/vcol_select_innodb.result | 2 +- .../suite/vcol/r/vcol_select_myisam.result | 2 +- mysql-test/t/order_by.test | 12 +++++ sql/sql_select.cc | 2 +- 9 files changed, 65 insertions(+), 37 deletions(-) diff --git a/mysql-test/r/bench_count_distinct.result b/mysql-test/r/bench_count_distinct.result index 8b67e4be38a..79e12afd237 100644 --- a/mysql-test/r/bench_count_distinct.result +++ b/mysql-test/r/bench_count_distinct.result @@ -5,7 +5,7 @@ count(distinct n) 100 explain extended select count(distinct n) from t1; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 range NULL n 4 NULL 10 100.00 Using index for group-by +1 SIMPLE t1 index NULL n 4 NULL 200 100.00 Using index Warnings: Note 1003 select count(distinct `test`.`t1`.`n`) AS `count(distinct n)` from `test`.`t1` drop table t1; diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index d6e5a69e217..b5e8cefca69 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -212,7 +212,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 index NULL PRIMARY 4 NULL 1 Using index explain SELECT distinct a from t3 order by a desc limit 2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t3 index NULL a 5 NULL 40 Using index +1 SIMPLE t3 index NULL a 5 NULL 2 Using index explain SELECT distinct a,b from t3 order by a+1; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t3 ALL NULL NULL NULL NULL 204 Using temporary; Using filesort diff --git a/mysql-test/r/explain_json.result b/mysql-test/r/explain_json.result index 568373f1e16..a46a3bcefa5 100644 --- a/mysql-test/r/explain_json.result +++ b/mysql-test/r/explain_json.result @@ -1030,10 +1030,10 @@ Table Op Msg_type Msg_text test.t1 analyze status Table is already up to date explain select count(distinct a1,a2,b) from t1 where (a2 >= 'b') and (b = 'a'); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using where; Using index for group-by +1 SIMPLE t1 index NULL idx_t1_2 147 NULL 128 Using where; Using index explain select count(distinct a1,a2,b,c) from t1 where (a2 >= 'b') and (b = 'a') and (c = 'i121'); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx_t1_1 163 NULL 65 Using where; Using index for group-by (scanning) +1 SIMPLE t1 index NULL idx_t1_1 163 NULL 128 Using where; Using index explain format=json select count(distinct a1,a2,b) from t1 where (a2 >= 'b') and (b = 'a'); EXPLAIN { @@ -1041,14 +1041,14 @@ EXPLAIN "select_id": 1, "table": { "table_name": "t1", - "access_type": "range", - "key": "idx_t1_1", + "access_type": "index", + "key": "idx_t1_2", "key_length": "147", "used_key_parts": ["a1", "a2", "b"], - "rows": 17, + "rows": 128, "filtered": 100, "attached_condition": "((t1.b = 'a') and (t1.a2 >= 'b'))", - "using_index_for_group_by": true + "using_index": true } } } @@ -1059,14 +1059,14 @@ EXPLAIN "select_id": 1, "table": { "table_name": "t1", - "access_type": "range", + "access_type": "index", "key": "idx_t1_1", "key_length": "163", "used_key_parts": ["a1", "a2", "b", "c"], - "rows": 65, + "rows": 128, "filtered": 100, "attached_condition": "((t1.b = 'a') and (t1.c = 'i121') and (t1.a2 >= 'b'))", - "using_index_for_group_by": "scanning" + "using_index": true } } } diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result index 8fbcdae38cd..cd7f1014ec0 100644 --- a/mysql-test/r/group_min_max.result +++ b/mysql-test/r/group_min_max.result @@ -1707,13 +1707,13 @@ select a1,a2,b from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1 a1 a2 b explain select distinct a1,a2,b from t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using index for group-by +1 SIMPLE t1 index NULL idx_t1_2 147 NULL 128 Using index explain select distinct a1,a2,b from t1 where (a2 >= 'b') and (b = 'a'); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using where; Using index for group-by +1 SIMPLE t1 index NULL idx_t1_2 147 NULL 128 Using where; Using index explain extended select distinct a1,a2,b,c from t1 where (a2 >= 'b') and (b = 'a') and (c = 'i121'); id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 index NULL idx_t1_1 163 NULL 128 50.78 Using where; Using index +1 SIMPLE t1 index NULL idx_t1_1 163 NULL 128 100.00 Using where; Using index Warnings: Note 1003 select distinct `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where ((`test`.`t1`.`b` = 'a') and (`test`.`t1`.`c` = 'i121') and (`test`.`t1`.`a2` >= 'b')) explain select distinct a1,a2,b from t1 where (a1 > 'a') and (a2 > 'a') and (b = 'c'); @@ -1724,13 +1724,13 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 index NULL idx_t1_2 147 NULL 128 Using where; Using index explain select distinct a1,a2,b from t2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using index for group-by +1 SIMPLE t2 index NULL idx_t2_2 146 NULL # Using index explain select distinct a1,a2,b from t2 where (a2 >= 'b') and (b = 'a'); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using where; Using index for group-by +1 SIMPLE t2 index NULL idx_t2_2 146 NULL # Using where; Using index explain extended select distinct a1,a2,b,c from t2 where (a2 >= 'b') and (b = 'a') and (c = 'i121'); id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t2 index NULL idx_t2_1 163 NULL 164 50.61 Using where; Using index +1 SIMPLE t2 index NULL idx_t2_1 163 NULL 164 100.00 Using where; Using index Warnings: Note 1003 select distinct `test`.`t2`.`a1` AS `a1`,`test`.`t2`.`a2` AS `a2`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` where ((`test`.`t2`.`b` = 'a') and (`test`.`t2`.`c` = 'i121') and (`test`.`t2`.`a2` >= 'b')) explain select distinct a1,a2,b from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c'); @@ -1855,7 +1855,7 @@ c e d e explain select distinct a1,a2,b from t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using index for group-by +1 SIMPLE t1 index NULL idx_t1_2 147 NULL 128 Using index explain select distinct a1,a2,b from t1 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using where; Using index for group-by @@ -1870,7 +1870,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using where; Using index for group-by; Using temporary; Using filesort explain select distinct a1,a2,b from t2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using index for group-by +1 SIMPLE t2 index NULL idx_t2_2 146 NULL # Using index explain select distinct a1,a2,b from t2 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using where; Using index for group-by @@ -1953,10 +1953,10 @@ b a explain select count(distinct a1,a2,b) from t1 where (a2 >= 'b') and (b = 'a'); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using where; Using index for group-by +1 SIMPLE t1 index NULL idx_t1_2 147 NULL 128 Using where; Using index explain select count(distinct a1,a2,b,c) from t1 where (a2 >= 'b') and (b = 'a') and (c = 'i121'); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx_t1_1 163 NULL 65 Using where; Using index for group-by (scanning) +1 SIMPLE t1 index NULL idx_t1_1 163 NULL 128 Using where; Using index explain extended select count(distinct a1,a2,b) from t1 where (a1 > 'a') and (a2 > 'a') and (b = 'c'); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 range idx_t1_0,idx_t1_1,idx_t1_2 idx_t1_1 147 NULL 14 100.00 Using where; Using index for group-by @@ -2173,7 +2173,7 @@ c d explain select distinct a1 from t1 where a2 = 'b'; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx_t1_1 130 NULL 5 Using where; Using index for group-by +1 SIMPLE t1 index NULL idx_t1_2 147 NULL 128 Using where; Using index select distinct a1 from t1 where a2 = 'b'; a1 a @@ -2283,7 +2283,7 @@ INSERT INTO t1 (a) VALUES ('SOUTH EAST'), ('SOUTH WEST'), ('WESTERN'); EXPLAIN SELECT DISTINCT a,a FROM t1 ORDER BY a; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL a 66 NULL 6 Using index for group-by +1 SIMPLE t1 index NULL a 66 NULL 11 Using index SELECT DISTINCT a,a FROM t1 ORDER BY a; a a @@ -2499,7 +2499,7 @@ INSERT INTO t1 VALUES (4), (2), (1), (2), (2), (4), (1), (4); EXPLAIN SELECT DISTINCT(a) FROM t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx 5 NULL 9 Using index for group-by +1 SIMPLE t1 index NULL idx 5 NULL 16 Using index SELECT DISTINCT(a) FROM t1; a 1 @@ -2507,7 +2507,7 @@ a 4 EXPLAIN SELECT SQL_BIG_RESULT DISTINCT(a) FROM t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx 5 NULL 9 Using index for group-by +1 SIMPLE t1 index NULL idx 5 NULL 16 Using index SELECT SQL_BIG_RESULT DISTINCT(a) FROM t1; a 1 @@ -2646,7 +2646,7 @@ INSERT INTO t1 SELECT * FROM t1; INSERT INTO t1 SELECT a,b,c+1,d FROM t1; EXPLAIN SELECT DISTINCT c FROM t1 WHERE d=4; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL foo 10 NULL 9 Using where; Using index for group-by +1 SIMPLE t1 index NULL foo 20 NULL 32 Using where; Using index SELECT DISTINCT c FROM t1 WHERE d=4; c 1 @@ -3339,19 +3339,19 @@ INSERT INTO t2 SELECT a, b + 4, c,d,e,f FROM t2; INSERT INTO t2 SELECT a + 1, b, c,d,e,f FROM t2; EXPLAIN SELECT COUNT(DISTINCT a) FROM t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL a 5 NULL 9 Using index for group-by +1 SIMPLE t1 index NULL a 10 NULL 16 Using index SELECT COUNT(DISTINCT a) FROM t1; COUNT(DISTINCT a) 2 EXPLAIN SELECT COUNT(DISTINCT a,b) FROM t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL a 10 NULL 9 Using index for group-by +1 SIMPLE t1 index NULL a 10 NULL 16 Using index SELECT COUNT(DISTINCT a,b) FROM t1; COUNT(DISTINCT a,b) 16 EXPLAIN SELECT COUNT(DISTINCT b,a) FROM t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL a 10 NULL 9 Using index for group-by +1 SIMPLE t1 index NULL a 10 NULL 16 Using index SELECT COUNT(DISTINCT b,a) FROM t1; COUNT(DISTINCT b,a) 16 @@ -3414,7 +3414,7 @@ COUNT(DISTINCT a) 2 EXPLAIN SELECT 1 FROM t1 HAVING COUNT(DISTINCT a) < 10; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL a 5 NULL 9 Using index for group-by +1 SIMPLE t1 index NULL a 10 NULL 16 Using index SELECT 1 FROM t1 HAVING COUNT(DISTINCT a) < 10; 1 1 @@ -3435,19 +3435,19 @@ COUNT(DISTINCT t1_1.a) 1 EXPLAIN SELECT COUNT(DISTINCT a), 12 FROM t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL a 5 NULL 9 Using index for group-by +1 SIMPLE t1 index NULL a 10 NULL 16 Using index SELECT COUNT(DISTINCT a), 12 FROM t1; COUNT(DISTINCT a) 12 2 12 EXPLAIN SELECT COUNT(DISTINCT a, b, c) FROM t2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL a 15 NULL 9 Using index for group-by +1 SIMPLE t2 index NULL a 15 NULL 16 Using index SELECT COUNT(DISTINCT a, b, c) FROM t2; COUNT(DISTINCT a, b, c) 16 EXPLAIN SELECT COUNT(DISTINCT a), SUM(DISTINCT a), AVG(DISTINCT a) FROM t2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL a 5 NULL 9 Using index for group-by +1 SIMPLE t2 index NULL a 15 NULL 16 Using index SELECT COUNT(DISTINCT a), SUM(DISTINCT a), AVG(DISTINCT a) FROM t2; COUNT(DISTINCT a) SUM(DISTINCT a) AVG(DISTINCT a) 2 3 1.5000 @@ -3459,7 +3459,7 @@ COUNT(DISTINCT a) SUM(DISTINCT a) AVG(DISTINCT f) 2 3 1.0000 EXPLAIN SELECT COUNT(DISTINCT a, b), COUNT(DISTINCT b, a) FROM t2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL a 10 NULL 9 Using index for group-by +1 SIMPLE t2 index NULL a 15 NULL 16 Using index SELECT COUNT(DISTINCT a, b), COUNT(DISTINCT b, a) FROM t2; COUNT(DISTINCT a, b) COUNT(DISTINCT b, a) 16 16 diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result index e24d9a94891..71aa32f0cee 100644 --- a/mysql-test/r/order_by.result +++ b/mysql-test/r/order_by.result @@ -3145,3 +3145,19 @@ id select_type table type possible_keys key key_len ref rows Extra drop table t0,t1,t2,t3; set @@optimizer_switch=@tmp_8989; set optimizer_switch='orderby_uses_equalities=on'; +# +# MDEV-10880: Assertions `keypart_map' or +# `prebuilt->search_tuple->n_fields > 0' fail on DISTINCT and +# GROUP BY constant +# +CREATE TABLE t1 (pk INT PRIMARY KEY); +INSERT INTO t1 VALUES (1),(2),(3); +SELECT DISTINCT pk FROM t1 GROUP BY 'foo'; +pk +1 +SELECT DISTINCT pk FROM t1; +pk +1 +2 +3 +DROP TABLE t1; diff --git a/mysql-test/suite/vcol/r/vcol_select_innodb.result b/mysql-test/suite/vcol/r/vcol_select_innodb.result index 97bfbbe4eaf..5c29f5f8283 100644 --- a/mysql-test/suite/vcol/r/vcol_select_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_select_innodb.result @@ -133,7 +133,7 @@ count(distinct c) 3 explain select count(distinct c) from t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL c 5 NULL 6 Using index for group-by (scanning) +1 SIMPLE t1 index NULL c 5 NULL 5 Using index ### ### filesort & range-based utils ### diff --git a/mysql-test/suite/vcol/r/vcol_select_myisam.result b/mysql-test/suite/vcol/r/vcol_select_myisam.result index 6dee132b3e5..7c371a1008a 100644 --- a/mysql-test/suite/vcol/r/vcol_select_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_select_myisam.result @@ -133,7 +133,7 @@ count(distinct c) 3 explain select count(distinct c) from t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL c 5 NULL 6 Using index for group-by (scanning) +1 SIMPLE t1 index NULL c 5 NULL 5 Using index ### ### filesort & range-based utils ### diff --git a/mysql-test/t/order_by.test b/mysql-test/t/order_by.test index 2d0c134a2d9..f61a6a8be34 100644 --- a/mysql-test/t/order_by.test +++ b/mysql-test/t/order_by.test @@ -2091,3 +2091,15 @@ set @@optimizer_switch=@tmp_8989; set optimizer_switch='orderby_uses_equalities=on'; + +--echo # +--echo # MDEV-10880: Assertions `keypart_map' or +--echo # `prebuilt->search_tuple->n_fields > 0' fail on DISTINCT and +--echo # GROUP BY constant +--echo # + +CREATE TABLE t1 (pk INT PRIMARY KEY); +INSERT INTO t1 VALUES (1),(2),(3); +SELECT DISTINCT pk FROM t1 GROUP BY 'foo'; +SELECT DISTINCT pk FROM t1; +DROP TABLE t1; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 50f121ce47f..9f339146646 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5708,7 +5708,7 @@ add_group_and_distinct_keys(JOIN *join, JOIN_TAB *join_tab) Item_field *cur_item; key_map possible_keys(0); - if (join->group_list) + if (join->group_list || join->simple_group) { /* Collect all query fields referenced in the GROUP clause. */ for (cur_group= join->group_list; cur_group; cur_group= cur_group->next) (*cur_group->item)->walk(&Item::collect_item_field_processor, 0, From 32659db8644504940f8d34835fde8f7b6535f1ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Mon, 26 Jun 2017 12:22:27 +0300 Subject: [PATCH 032/102] Fix merge error from 10.0 Item_func_sysconst behaves as a non-constant function during prepared statements and view creation and constant otherwise. Current condition implied the opposite. --- sql/item_strfunc.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 6de9b3ca785..8e8a77e5042 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2339,7 +2339,7 @@ Item *Item_func_sysconst::safe_charset_converter(THD *thd, CHARSET_INFO *tocs) Return the identical item during view creation and prepare. */ - if (!thd->lex->is_ps_or_view_context_analysis()) + if (thd->lex->is_ps_or_view_context_analysis()) return this; return const_charset_converter(thd, tocs, true, fully_qualified_func_name()); } From 3125ba891292ff16186c105b6780fbadc74421e9 Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Tue, 27 Jun 2017 03:48:04 +0300 Subject: [PATCH 033/102] Updated list of unstable tests for 10.1.25 release --- mysql-test/unstable-tests | 144 ++++++++++++++------------------------ 1 file changed, 51 insertions(+), 93 deletions(-) diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests index d21035a868e..9e7d4f7f76f 100644 --- a/mysql-test/unstable-tests +++ b/mysql-test/unstable-tests @@ -29,63 +29,57 @@ main.analyze_format_json : MDEV-11866 - Wrong result main.analyze_stmt_orderby : MDEV-11866 - Wrong result main.analyze_stmt_slow_query_log : MDEV-12237 - Wrong result main.create_delayed : MDEV-10605 - failed with timeout -main.ctype_upgrade : Modified in 10.1.23 main.ctype_utf16le : MDEV-10675: timeout or extra warnings main.derived_view : Modified in 10.1.24 main.drop-no_root : MDEV-12633 - Valgrind warnings -main.events_2 : Modified in 10.1.23 +main.errors : MDEV-13179 - Wrong error 1290; modified in 10.1.25 main.events_bugs : MDEV-12892 - Crash in fill_schema_processlist main.events_restart : MDEV-12236 - Server shutdown problem -main.func_regexp_pcre : Modified in 10.1.24 -main.gis : Modified in 10.1.23 +main.func_regexp_pcre : Modified in 10.1.25 main.host_cache_size_functionality : MDEV-10606 - sporadic failure on shutdown main.index_intersect_innodb : MDEV-10643 - failed with timeout main.index_merge_innodb : MDEV-7142 - Wrong execution plan, timeout with valgrind main.innodb_mysql_lock : MDEV-7861 - sporadic lock detection failure +main.join_outer : Modified in 10.1.25 main.kill_processlist-6619 : MDEV-10793 - wrong result in processlist -main.loaddata : Modified in 10.1.23 main.loadxml : Modified in 10.1.24 -main.log_tables-big : Modified in 10.1.23 main.mdev-504 : MDEV-10607 - sporadic "can't connect" main.mdev375 : MDEV-10607 - sporadic "can't connect" +main.mdl_sync : Modified in 10.1.25 main.merge : MDEV-10607 - sporadic "can't connect" main.myisam_debug : Modified in 10.1.24 main.mysqlcheck : MDEV-12633 - Valgrind warnings -main.mysqlhotcopy_myisam : Uses mysqlhotcopy.inc modified in 10.1.23 main.mysqlslap : MDEV-11801 - timeout main.mysqltest : MDEV-9269 - fails on Alpha; modified in 10.1.24 main.mysql_client_test : MDEV-12633 - Valgrind warnings main.mysql_client_test_comp : MDEV-12633 - Valgrind warnings main.mysql_client_test_nonblock : MDEV-12633 - Valgrind warnings -main.mysqldump : Modified in 10.1.23 -main.mysqltest : Modified in 10.1.23 +main.mysqld--help : Modified in 10.1.25 +main.order_by : MOdified in 10.1.25 main.order_by_optimizer_innodb : MDEV-10683 - wrong execution plan -main.partition_alter : Modified in 10.1.24 +main.partition_alter : Modified in 10.1.25 +main.partition_innodb_plugin : MDEV-12901 - Valgrind warnings main.ps : MDEV-11017 - sporadic wrong Prepared_stmt_count main.query_cache : MDEV-12895 - Wrong result main.range_vs_index_merge_innodb : MDEV-12637 - Timeout main.repair_symlink-5543 : MDEV-12215 - Wrong error codes +main.set_statement : MDEV-13183 - Wrong result main.show_check : MDEV-12633 - Valgrind warnings main.show_explain : MDEV-10674 - sporadic failure main.sp-security : MDEV-10607 - sporadic "can't connect" main.status : MDEV-8510 - sporadic wrong result -main.subselect4 : Modified in 10.1.23 -main.subselect_exists2in : Modified in 10.1.23 -main.subselect_innodb : MDEV-10614 - sporadic wrong results; also modified in 10.1.23 +main.subselect_innodb : MDEV-10614 - sporadic wrong results main.subselect_mat_cost_bugs : Modified in 10.1.24 main.subselect_sj : Modified in 10.1.24 -main.subselect_sj_mat : Modified in 10.1.23 main.subselect_sj2_mat : Modified in 10.1.24 -main.symlink : Modified in 10.1.23 main.symlink-aria-11902 : MDEV-12215 - Unexpected errors -main.symlink-myisam-11902 : MDEV-12215 - Unexpected errors; modified in 10.1.23 +main.symlink-myisam-11902 : MDEV-12215 - Unexpected errors main.type_datetime_hires : MDEV-10687 - timeout -main.view : Modified in 10.1.23 +main.view : Modified in 10.1.25 #---------------------------------------------------------------- archive.discover : MDEV-10510 - table is marked as crashed -archive.mysqlhotcopy_archive : Uses mysqlhotcopy.inc modified in 10.1.23 #---------------------------------------------------------------- @@ -104,7 +98,6 @@ binlog_encryption.rpl_semi_sync : MDEV-11220 - Wrong result, MDEV-11673 - Val #---------------------------------------------------------------- connect.jdbc_new : Modified in 10.1.24 -connect.secure_file_priv : Modified in 10.1.23 connect.tbl : MDEV-9844, MDEV-10179 - sporadic crashes, valgrind warnings, wrong results #---------------------------------------------------------------- @@ -114,29 +107,21 @@ csv.read_only : Added in 10.1.24 #---------------------------------------------------------------- encryption.create_or_replace : MDEV-9359 - Assertion failure -encryption.debug_key_management : Modified in 10.1.23 -encryption.encrypt_and_grep : Modified in 10.1.23 -encryption.innodb-bad-key-change : MDEV-12926 - Valgrind; modified in 10.1.23 -encryption.innodb-bad-key-change2 : MDEV-12632 - Valgrind warnings, modified in 10.1.23 -encryption.innodb-bad-key-change4 : Modified in 10.1.23 -encryption.innodb-compressed-blob : Added in 10.1.23 +encryption.innodb-bad-key-change2 : MDEV-12632 - Valgrind warnings +encryption.innodb-checksum-algorithm : MDEV-13167 - Assertion failure; added in 10.1.25 +encryption.innodb-compressed-blob : Modified in 10.1.25 encryption.innodb-discard-import-change : MDEV-12632 - Valgrind warnings -encryption.innodb-encryption-disable : Modified in 10.1.23 encryption.innodb_encryption_discard_import : MDEV-12903 - Wrong result encryption.innodb_encryption_filekeys : MDEV-9962 - timeouts -encryption.innodb_encryption-page-compression : MDEV-12630 - crash or assertion failure, modified in 10.1.23 +encryption.innodb_encryption-page-compression : MDEV-12630 - crash or assertion failure encryption.innodb_encryption_tables : MDEV-9359 - Assertion failure encryption.innodb_first_page : MDEV-10689 - crashes -encryption.innodb-force-corrupt : Added in 10.1.23 +encryption.innodb-first-page-read : MDEV-13181 - Signal 8; added in 10.1.25 encryption.innodb-key-rotation-disable : Modified in 10.1.24 encryption.innodb_lotoftables : MDEV-11531 - InnoDB error -encryption.innodb-missing-key : MDEV-9359 - assertion failure; also modified in 10.1.23 -encryption.innodb_onlinealter_encryption : MDEV-12926 - Valgrind; modified in 10.1.23 +encryption.innodb-missing-key : MDEV-9359 - assertion failure encryption.innodb-page_encryption : MDEV-10641 - mutex problem -encryption.innodb-page_encryption_compression : Modified in 10.1.23 -encryption.innodb-page_encryption_log_encryption : Modified in 10.1.23 -encryption.innodb-redo-badkey : MDEV-12898 - Server hang on startup, also added in 10.1.23 -encryption.innodb-redo-nokeys : Added in 10.1.23 +encryption.innodb-redo-badkey : MDEV-12898 - Server hang on startup encryption.innodb_scrub : MDEV-8139 - scrubbing tests need fixing encryption.innodb_scrub_background : MDEV-8139 - scrubbing tests need fixing encryption.innodb_scrub_compressed : MDEV-8139 - scrubbing tests need fixing @@ -164,68 +149,28 @@ funcs_2.myisam_charset : MDEV-11535 - Timeout #---------------------------------------------------------------- -galera.ev51914 : Added in 10.1.23 -galera.GAL-401 : Added in 10.1.23 -galera.GAL-419 : Added in 10.1.23 -galera.GAL-480 : Added in 10.1.23 -galera.galera_account_management : Modified in 10.1.23 -galera.galera_admin : Added in 10.1.23 galera.galera_autoinc_sst_xtrabackup : Config modified in 10.1.24 -galera.galera_bf_abort : Modified in 10.1.23 galera.galera_defaults : Include file modified in 10.1.24 -galera.galera_desync_overlapped : Added in 10.1.23 -galera.galera_gcache_recover : Added in 10.1.23 -galera.galera_gcache_recover_full_gcache : Added in 10.1.23 -galera.galera_gcache_recover_manytrx : Added in 10.1.23 galera.galera_gcs_fc_limit : Modified in 10.1.24 -galera.galera_many_tables_pk : Modified in 10.1.23 -galera.galera_restart_on_unknown_option : Added in 10.1.23 -galera.galera_roles : Modified in 10.1.23 -galera.galera_toi_ddl_fk_update : Added in 10.1.23 -galera.galera_toi_drop_database : Added in 10.1.23 -galera.galera_toi_truncate : Added in 10.1.23 -galera.galera_var_cluster_address : Modified in 10.1.23 -galera.galera_var_retry_autocommit : Added in 10.1.23 -galera.galera_var_slave_threads : Modified in 10.1.23 -galera.galera_wsrep_log_conficts : Added in 10.1.23 -galera.galera_wsrep_provider_options_syntax : Added in 10.1.23 -galera.galera#414 : Modified in 10.1.23 -galera.lp1376747 : Added in 10.1.23 -galera.lp1376747-2 : Added in 10.1.23 -galera.lp1376747-3 : Added in 10.1.23 -galera.lp1376747-4 : Added in 10.1.23 -galera.MW-258 : Modified in 10.1.23 -galera.MW-309 : Added in 10.1.24 -galera.MW-313 : Added in 10.1.23 -galera.MW-328A : Added in 10.1.23 -galera.MW-328B : Added in 10.1.23 -galera.MW-328C : Added in 10.1.23 -galera.MW-328D : Added in 10.1.23 -galera.MW-328E : Added in 10.1.23 -galera.MW-329 : Added in 10.1.23 -galera.pxc-421 : Added in 10.1.23 +galera.MW-369 : Added in 10.1.25 -galera_3nodes.* : MDEV-11490 - Warnings not suppressed; config files modified in 10.1.24 - -galera_3nodes.galera_safe_to_bootstrap : Added in 10.1.23 +galera_3nodes.* : config files modified in 10.1.24 #---------------------------------------------------------------- -innodb.autoinc_debug : Added in 10.1.23 +innodb.101_compatibility : Modified in 10.1.25 innodb.binlog_consistent : MDEV-10618 - Server fails to start -innodb.doublewrite : MDEV-12905 - Lost connection to MySQL server +innodb.doublewrite : MDEV-12905 - Lost connection to MySQL server; modified in 10.1.25 innodb.drop_table_background : Added in 10.1.24 -innodb.innodb-alter-debug : Added in 10.1.23 -innodb.innodb-alter-nullable : Added in 10.1.23 -innodb.innodb-alter-table : MDEV-10619 - Testcase timeout +innodb.innodb-alter-debug : MDEV-13182 - InnoDB: adjusting FSP_SPACE_FLAGS; modified in 10.1.25 +innodb.innodb-alter-discard : Modified in 10.1.25 +innodb.innodb-alter-nullable : Modified in 10.1.25 +innodb.innodb-alter-table : MDEV-10619 - Testcase timeout; modified in 10.1.25 +innodb.innodb-alter-tempfile : Modified in 10.1.25 innodb.innodb-blob : MDEV-12053 - Client crash innodb.innodb_bug14147491 : MDEV-11808 - wrong error codes, also modified in 10.1.24 -innodb.innodb_bug14676111 : Modified in 10.1.23 innodb.innodb_bug30423 : MDEV-7311 - Wrong number of rows in the plan innodb.innodb_bug53290 : MDEV-12634 - Valgrind warnings -innodb.innodb_defragment : Modified in 10.1.23 -innodb.innodb_defragment_small : Added in 10.1.23 -innodb.innodb-index-online-norebuild : Added in 10.1.23 innodb.innodb-page_compression_bzip2 : Modified in 10.1.24 innodb.innodb-page_compression_default : Modified in 10.1.24 innodb.innodb-page_compression_lz4 : Modified in 10.1.24 @@ -236,15 +181,29 @@ innodb.innodb-page_compression_zip : MDEV-10641 - mutex problem; modified innodb.innodb_prefix_index_restart_server : MDEV-12899 - Server crash on shutdown innodb.innodb_stats : MDEV-10682 - wrong result innodb.innodb_sys_semaphore_waits : MDEV-10331 - wrong result -innodb.log_data_file_size : MDEV-12893 - Database page corruption -innodb.log_file_size : Modified in 10.1.24 +innodb.log_data_file_size : MDEV-12893 - Database page corruption; modified in 10.1.25 +innodb.log_file_size : Modified in 10.1.25 +innodb.row_format_redundant : Added in 10.1.25 +innodb.table_flags : Added in 10.1.25 innodb_fts.fulltext_misc : MDEV-12636 - Valgrind warnings +innodb_zip.innodb_bug36169 : Modified in 10.1.25 +innodb_zip.innodb_bug36172 : Modified in 10.1.25 +innodb_zip.innodb_bug52745 : Modified in 10.1.25 +innodb_zip.innodb_bug53591 : Modified in 10.1.25 +innodb_zip.innodb_bug56680 : Modified in 10.1.25 +innodb_zip.innodb-create-options : Modified in 10.1.25 +innodb_zip.innodb-zip : Modified in 10.1.25 + #---------------------------------------------------------------- mariabackup.* : suite.pm modified in 10.1.24 +mariabackup.full_backup : Modified in 10.1.25 +mariabackup.incremental_encrypted : Modified in 10.1.25 +mariabackup.xb_file_key_management : Modified in 10.1.25 + #---------------------------------------------------------------- mroonga/storage.column_datetime_32bit_2038 : Wrong result on Alpha @@ -260,6 +219,7 @@ mroonga/storage.repair_table_no_index_file : MDEV-9364 - multi_source.gtid : MDEV-10417 - Fails on Mips multi_source.info_logs : MDEV-10042 - Wrong result, MDEV-12629 - Valgrind warnings +multi_source.mdev-9544 : Added in 10.1.25 multi_source.multisource : MDEV-10417 - Fails on Mips multi_source.reset_slave : MDEV-10690 - wrong result multi_source.simple : MDEV-4633 - Wrong slave status output @@ -271,13 +231,10 @@ parts.partition_innodb_status_file : MDEV-12901 - Valgrind #---------------------------------------------------------------- +perfschema.bad_option_2 : Modified in 10.1.25 perfschema.func_file_io : MDEV-5708 - fails for s390x perfschema.func_mutex : MDEV-5708 - fails for s390x -perfschema.pfs_upgrade_event : Modified in 10.1.23 -perfschema.pfs_upgrade_func : Modified in 10.1.23 -perfschema.pfs_upgrade_proc : Modified in 10.1.23 -perfschema.pfs_upgrade_table : Modified in 10.1.23 -perfschema.pfs_upgrade_view : Modified in 10.1.23 +perfschema.privilege_table_io : MDEV-13184 - Extra lines perfschema.setup_actors : MDEV-10679 - rare crash perfschema.socket_summary_by_event_name_func : MDEV-10622 - Socket summary tables do not match perfschema.stage_mdl_global : MDEV-11803 - wrong result on slow builders @@ -311,10 +268,10 @@ rpl.rpl_insert : MDEV-9329 - Fails on Ubuntu/s390x rpl.rpl_insert_delayed : MDEV-9329 - Fails on Ubuntu/s390x rpl.rpl_invoked_features : MDEV-10417 - Fails on Mips rpl.rpl_mariadb_slave_capability : MDEV-11018 - sporadic wrong events in binlog -rpl.rpl_mdev-11092 : Added in 10.1.24 +rpl.rpl_mdev-11092 : MDEV-13065 - Wrong value in include; added in 10.1.24 rpl.rpl_mdev6020 : MDEV-10630, MDEV-10417 - Timeouts, fails on Mips -rpl.rpl_mysql_upgrade : Modified in 10.1.23 rpl.rpl_parallel : MDEV-10653 - Timeouts +rpl.rpl_parallel_mdev6589 : MDEV-12979 - Assertion failure rpl.rpl_parallel_optimistic : MDEV-10511 - timeout rpl.rpl_parallel_retry : MDEV-11119 - Server crash rpl.rpl_parallel_temptable : MDEV-10356 - Crash in close_thread_tables @@ -322,6 +279,7 @@ rpl.rpl_partition_innodb : MDEV-10417 - Fails on Mips rpl.rpl_password_boundaries : MDEV-11534 - Slave IO warnings rpl.rpl_row_log_innodb : MDEV-10688 - Wrong result rpl.rpl_row_sp001 : MDEV-9329 - Fails on Ubuntu/s390x +rpl.rpl_row_utf32 : One-time server startup timeout on ppc64le in 10.1.25 rpl.rpl_semi_sync : MDEV-11220 - Wrong result rpl.rpl_semi_sync_event_after_sync : MDEV-11806 - warnings rpl.rpl_semi_sync_uninstall_plugin : MDEV-7140 - Wrong plugin status, MDEV-10892 - Assertion failure @@ -370,6 +328,7 @@ sys_vars.delay_key_write_func : Modified in 10.1.24 sys_vars.keep_files_on_create_basic : MDEV-10676 - timeout sys_vars.innodb_buffer_pool_dump_pct_basic : MDEV-10651 - sporadic failure on file_exists sys_vars.innodb_fatal_semaphore_wait_threshold : MDEV-10513 - crashes +sys_vars.innodb_sched_priority_cleaner_basic : Modified in 10.1.25 sys_vars.log_slow_admin_statements_func : MDEV-12235 - Server crash sys_vars.rpl_init_slave_func : MDEV-10149 - wrong results sys_vars.sysvars_innodb : MDEV-6958 - error-prone rdiffs @@ -424,6 +383,5 @@ vcol.vcol_keys_innodb : MDEV-10639 - Testcase timeout wsrep.binlog_format : MDEV-11532 - WSREP has not yet prepared node wsrep.pool_of_threads : MDEV-12234 - Library problem on Power wsrep.variables : Include file modified in 10.1.24 -wsrep.wsrep_rpl : Modified in 10.1.23 wsrep_info.plugin : MDEV-12909 - Wrong result From 39385ff7b253302723a94c896d199a83adb8622f Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 27 Jun 2017 13:25:50 +0200 Subject: [PATCH 034/102] MDEV-13187 incorrect backslash parsing in clients don't do backslash escapes inside backticks --- client/mysql.cc | 4 ++-- client/mysqltest.cc | 4 ++-- mysql-test/r/mysql.result | 28 ++++++++++++++++++++++++++++ mysql-test/t/mysql.test | 15 +++++++++++++++ 4 files changed, 47 insertions(+), 4 deletions(-) diff --git a/client/mysql.cc b/client/mysql.cc index 57cb0a918a7..6a800e407a3 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2287,8 +2287,8 @@ static bool add_line(String &buffer, char *line, ulong line_length, continue; } #endif - if (!*ml_comment && inchar == '\\' && - !(*in_string && + if (!*ml_comment && inchar == '\\' && *in_string != '`' && + !(*in_string && (mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES))) { // Found possbile one character command like \c diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 4de40953f7d..ee636c9401d 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6594,7 +6594,7 @@ int read_line(char *buf, int size) state= R_Q; } } - have_slash= (c == '\\'); + have_slash= (c == '\\' && last_quote != '`'); break; case R_COMMENT: @@ -6664,7 +6664,7 @@ int read_line(char *buf, int size) case R_Q: if (c == last_quote) state= R_NORMAL; - else if (c == '\\') + else if (c == '\\' && last_quote != '`') state= R_SLASH_IN_Q; break; diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index dd0129df0d9..dad8b3a701c 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -529,3 +529,31 @@ a +-------------------+ End of tests +create table `a1\``b1` (a int); +show tables; +Tables_in_test +a1\`b1 +insert `a1\``b1` values (1),(2); +show create table `a1\``b1`; +Table Create Table +a1\`b1 CREATE TABLE `a1\``b1` ( + `a` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `a1\``b1` ( + `a` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; +INSERT INTO `a1\``b1` VALUES (1),(2); +insert `a1\``b1` values (4),(5); +show create table `a1\``b1`; +Table Create Table +a1\`b1 CREATE TABLE `a1\``b1` ( + `a` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +select * from `a1\``b1`; +a +1 +2 +drop table `a1\``b1`; diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index d59083d66b0..20205924e15 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -618,3 +618,18 @@ EOF --echo --echo End of tests + +# +# MDEV-13187 incorrect backslash parsing in clients +# +create table `a1\``b1` (a int); +show tables; +insert `a1\``b1` values (1),(2); +show create table `a1\``b1`; +--exec $MYSQL_DUMP --compact test +--exec $MYSQL_DUMP test > $MYSQLTEST_VARDIR/tmp/bug.sql +insert `a1\``b1` values (4),(5); +--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug.sql +show create table `a1\``b1`; +select * from `a1\``b1`; +drop table `a1\``b1`; From d5cd33450413816f8696125cd66c8393921e6267 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 27 Jun 2017 14:00:10 +0200 Subject: [PATCH 035/102] MDEV-13187 incorrect backslash parsing in clients cover ANSI_QUOTES and NO_BACKSLASH_ESCAPES in mysqltest --- client/mysql.cc | 2 ++ client/mysqltest.cc | 14 ++++++++++++-- include/mysql_com.h | 2 ++ mysql-test/r/mysql.result | 30 ++++++++++++++++++++++++++++++ mysql-test/r/mysqltest.result | 5 +++++ mysql-test/t/mysql.test | 15 +++++++++++++++ mysql-test/t/mysqltest.test | 8 +++++++- sql/sql_class.cc | 2 ++ sql/sys_vars.cc | 4 ++++ 9 files changed, 79 insertions(+), 3 deletions(-) diff --git a/client/mysql.cc b/client/mysql.cc index 6a800e407a3..a965ced89c6 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2288,6 +2288,8 @@ static bool add_line(String &buffer, char *line, ulong line_length, } #endif if (!*ml_comment && inchar == '\\' && *in_string != '`' && + !(*in_string == '"' && + (mysql.server_status & SERVER_STATUS_ANSI_QUOTES)) && !(*in_string && (mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES))) { diff --git a/client/mysqltest.cc b/client/mysqltest.cc index ee636c9401d..f5ee94f1839 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6486,6 +6486,16 @@ my_bool end_of_query(int c) } +static inline bool is_escape_char(char c, char in_string) +{ + if (c != '\\' || in_string == '`') return false; + if (!cur_con) return true; + uint server_status= cur_con->mysql->server_status; + if (server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES) return false; + return !(server_status & SERVER_STATUS_ANSI_QUOTES && in_string == '"'); +} + + /* Read one "line" from the file @@ -6594,7 +6604,7 @@ int read_line(char *buf, int size) state= R_Q; } } - have_slash= (c == '\\' && last_quote != '`'); + have_slash= is_escape_char(c, last_quote); break; case R_COMMENT: @@ -6664,7 +6674,7 @@ int read_line(char *buf, int size) case R_Q: if (c == last_quote) state= R_NORMAL; - else if (c == '\\' && last_quote != '`') + else if (is_escape_char(c, last_quote)) state= R_SLASH_IN_Q; break; diff --git a/include/mysql_com.h b/include/mysql_com.h index 0d57b178937..df9681e02a4 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -296,6 +296,8 @@ enum enum_server_command */ #define SERVER_PS_OUT_PARAMS 4096 +#define SERVER_STATUS_ANSI_QUOTES 32768 + /** Server status flags that must be cleared when starting execution of a new SQL statement. diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index dad8b3a701c..8a24128daa2 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -557,3 +557,33 @@ a 1 2 drop table `a1\``b1`; +set sql_mode=ansi_quotes; +create table "a1\""b1" (a int); +show tables; +Tables_in_test +a1\"b1 +insert "a1\""b1" values (1),(2); +show create table "a1\""b1"; +Table Create Table +a1\"b1 CREATE TABLE "a1\""b1" ( + "a" int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE "a1\""b1" ( + "a" int(11) DEFAULT NULL +); +/*!40101 SET character_set_client = @saved_cs_client */; +INSERT INTO "a1\""b1" VALUES (1),(2); +insert "a1\""b1" values (4),(5); +show create table "a1\""b1"; +Table Create Table +a1\"b1 CREATE TABLE "a1\""b1" ( + "a" int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +select * from "a1\""b1"; +a +1 +2 +drop table "a1\""b1"; +set sql_mode=default; diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 0ebef585974..9800aed6368 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -957,4 +957,9 @@ con1 con2 con2 -closed_connection- +set sql_mode=no_backslash_escapes; +select "foo\""bar"; +foo\"bar +foo\"bar +set sql_mode=default; End of tests diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 20205924e15..dd964c46420 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -633,3 +633,18 @@ insert `a1\``b1` values (4),(5); show create table `a1\``b1`; select * from `a1\``b1`; drop table `a1\``b1`; + +# same with ansi_quotes +set sql_mode=ansi_quotes; +create table "a1\""b1" (a int); +show tables; +insert "a1\""b1" values (1),(2); +show create table "a1\""b1"; +--exec $MYSQL_DUMP --compact --compatible=postgres test +--exec $MYSQL_DUMP --compatible=postgres test > $MYSQLTEST_VARDIR/tmp/bug.sql +insert "a1\""b1" values (4),(5); +--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug.sql +show create table "a1\""b1"; +select * from "a1\""b1"; +drop table "a1\""b1"; +set sql_mode=default; diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 6470ede4f14..afe37926591 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -2942,11 +2942,17 @@ disconnect $x; # Disconnect the selected connection disconnect $y; --echo $CURRENT_CONNECTION +connection default; +# +# MDEV-13187 incorrect backslash parsing in clients +# +set sql_mode=no_backslash_escapes; +select "foo\""bar"; +set sql_mode=default; --echo End of tests -connection default; # Wait till we reached the initial number of concurrent sessions --source include/wait_until_count_sessions.inc diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 46eabb41a74..3c07c1606a2 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1250,6 +1250,8 @@ void THD::init(void) server_status= SERVER_STATUS_AUTOCOMMIT; if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) server_status|= SERVER_STATUS_NO_BACKSLASH_ESCAPES; + if (variables.sql_mode & MODE_ANSI_QUOTES) + server_status|= SERVER_STATUS_ANSI_QUOTES; transaction.all.modified_non_trans_table= transaction.stmt.modified_non_trans_table= FALSE; diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 35997525456..ffe861ddfbc 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2173,6 +2173,10 @@ static bool fix_sql_mode(sys_var *self, THD *thd, enum_var_type type) thd->server_status|= SERVER_STATUS_NO_BACKSLASH_ESCAPES; else thd->server_status&= ~SERVER_STATUS_NO_BACKSLASH_ESCAPES; + if (thd->variables.sql_mode & MODE_ANSI_QUOTES) + thd->server_status|= SERVER_STATUS_ANSI_QUOTES; + else + thd->server_status&= ~SERVER_STATUS_ANSI_QUOTES; } return false; } From 5c89f23b4591db0c60eed34caaa28e1ba67bea63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Thu, 29 Jun 2017 21:27:05 +0300 Subject: [PATCH 036/102] Fix debug assert post MDEV-10306 tmp variable now points to str->ptr() buffer, not tmp_value buffer. Comparing pointers otherwise can lead to false assertion errors as we don't know where buffers are allocated in respect to each other. --- sql/item_strfunc.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index f559677051b..22e13bf6c38 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1171,7 +1171,7 @@ String *Item_func_reverse::val_str(String *str) if ((l= my_ismbchar(res->charset(),ptr,end))) { tmp-= l; - DBUG_ASSERT(tmp >= tmp_value.ptr()); + DBUG_ASSERT(tmp >= str->ptr()); memcpy(tmp,ptr,l); ptr+= l; } From 4db6e1e4a502df5a4b30aed60552314533b35d79 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 29 Jun 2017 20:47:08 +0200 Subject: [PATCH 037/102] uninitialized variable --- client/mysqltest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index f5ee94f1839..98e35136b2a 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6522,7 +6522,7 @@ static inline bool is_escape_char(char c, char in_string) int read_line(char *buf, int size) { - char c, UNINIT_VAR(last_quote), last_char= 0; + char c, last_quote=0, last_char= 0; char *p= buf, *buf_end= buf + size - 1; int skip_char= 0; my_bool have_slash= FALSE; From 273e0f663e5a7254aa4e956572f6faa97e5579c9 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 30 Jun 2017 10:28:01 +0200 Subject: [PATCH 038/102] MDEV-13179 main.errors fails in buildbot and outside with wrong errno 1290 --- mysql-test/r/errors.result | 2 +- mysql-test/t/errors.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result index bf75bf73862..be1a9f06810 100644 --- a/mysql-test/r/errors.result +++ b/mysql-test/r/errors.result @@ -170,5 +170,5 @@ ERROR 22007: Illegal value used as argument of dynamic column function drop table t1; set max_session_mem_used = 8192; select * from seq_1_to_1000; -ERROR HY000: Engine SEQUENCE failed to discover table `test`.`seq_1_to_1000` with 'create table seq (seq bigint unsigned primary key)' +Got one of the listed errors set global max_session_mem_used = default; diff --git a/mysql-test/t/errors.test b/mysql-test/t/errors.test index 9d5cbef89b1..d1d83248df4 100644 --- a/mysql-test/t/errors.test +++ b/mysql-test/t/errors.test @@ -204,6 +204,6 @@ drop table t1; # errors caused by max_session_mem_used # set max_session_mem_used = 8192; ---error ER_SQL_DISCOVER_ERROR +--error ER_SQL_DISCOVER_ERROR,ER_OPTION_PREVENTS_STATEMENT select * from seq_1_to_1000; set global max_session_mem_used = default; From 4fe89773d811f1414165d1efb1b910a7f47a69f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 22 Jun 2017 12:21:54 +0300 Subject: [PATCH 039/102] Mariabackup: Clean up xtrabackup options Fix the binding of databases_file. It was incorrectly mapped to OPT_XTRA_TABLES_FILE. Remove some unused options and variables. --- extra/mariabackup/xtrabackup.cc | 21 +-------------------- extra/mariabackup/xtrabackup.h | 4 ---- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index a268c3f7a78..6e15a9973ce 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -239,7 +239,6 @@ long innobase_open_files = 300L; longlong innobase_page_size = (1LL << 14); /* 16KB */ static ulong innobase_log_block_size = 512; -my_bool innobase_fast_checksum = FALSE; char* innobase_doublewrite_file = NULL; char* innobase_buffer_pool_filename = NULL; @@ -361,9 +360,6 @@ const char *opt_history = NULL; #if defined(HAVE_OPENSSL) my_bool opt_ssl_verify_server_cert = FALSE; -#if !defined(HAVE_YASSL) -char *opt_server_public_key = NULL; -#endif #endif /* Whether xtrabackup_binlog_info should be created on recovery */ @@ -511,8 +507,6 @@ enum options_xtrabackup OPT_INNODB_USE_NATIVE_AIO, OPT_INNODB_PAGE_SIZE, OPT_INNODB_LOG_BLOCK_SIZE, - OPT_INNODB_FAST_CHECKSUM, - OPT_INNODB_EXTRA_UNDOSLOTS, OPT_INNODB_DOUBLEWRITE_FILE, OPT_INNODB_BUFFER_POOL_FILENAME, OPT_INNODB_FORCE_RECOVERY, @@ -564,10 +558,6 @@ enum options_xtrabackup OPT_BINLOG_INFO, OPT_XB_SECURE_AUTH, - OPT_SSL_SSL, - OPT_SSL_VERIFY_SERVER_CERT, - OPT_SERVER_PUBLIC_KEY, - OPT_XTRA_TABLES_EXCLUDE, OPT_XTRA_DATABASES_EXCLUDE, }; @@ -629,7 +619,7 @@ struct my_option xb_client_options[] = {"databases", OPT_XTRA_DATABASES, "filtering by list of databases.", (G_PTR*) &xtrabackup_databases, (G_PTR*) &xtrabackup_databases, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"databases_file", OPT_XTRA_TABLES_FILE, + {"databases_file", OPT_XTRA_DATABASES_FILE, "filtering by list of databases in the file.", (G_PTR*) &xtrabackup_databases_file, (G_PTR*) &xtrabackup_databases_file, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -1060,10 +1050,6 @@ Disable with --skip-innodb-doublewrite.", (G_PTR*) &innobase_use_doublewrite, "Changing for created log file is not supported. Use on your own risk!", (G_PTR*) &innobase_log_block_size, (G_PTR*) &innobase_log_block_size, 0, GET_ULONG, REQUIRED_ARG, 512, 512, 1 << UNIV_PAGE_SIZE_SHIFT_MAX, 0, 1L, 0}, - {"innodb_fast_checksum", OPT_INNODB_FAST_CHECKSUM, - "Change the algorithm of checksum for the whole of datapage to 4-bytes word based.", - (G_PTR*) &innobase_fast_checksum, - (G_PTR*) &innobase_fast_checksum, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"innodb_doublewrite_file", OPT_INNODB_DOUBLEWRITE_FILE, "Path to special datafile for doublewrite buffer. (default is "": not used)", (G_PTR*) &innobase_doublewrite_file, (G_PTR*) &innobase_doublewrite_file, @@ -1290,11 +1276,6 @@ xb_get_one_option(int optid, ADD_PRINT_PARAM_OPT(innobase_page_size); break; - case OPT_INNODB_FAST_CHECKSUM: - - ADD_PRINT_PARAM_OPT(!!innobase_fast_checksum); - break; - case OPT_INNODB_LOG_BLOCK_SIZE: ADD_PRINT_PARAM_OPT(innobase_log_block_size); diff --git a/extra/mariabackup/xtrabackup.h b/extra/mariabackup/xtrabackup.h index a26f00f6b06..455b85c4abc 100644 --- a/extra/mariabackup/xtrabackup.h +++ b/extra/mariabackup/xtrabackup.h @@ -213,11 +213,7 @@ bool check_if_param_set(const char *param); #if defined(HAVE_OPENSSL) -extern my_bool opt_use_ssl; extern my_bool opt_ssl_verify_server_cert; -#if !defined(HAVE_YASSL) -extern char *opt_server_public_key; -#endif #endif From a1e51e7f479cab7f46c12d0c488a6b310ae64807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 30 Jun 2017 11:28:52 +0300 Subject: [PATCH 040/102] Mariabackup: Test file cleanup --- .../suite/mariabackup/include/restart_and_restore.inc | 10 ++-------- .../suite/mariabackup/xb_compressed_encrypted.test | 6 +++--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/mysql-test/suite/mariabackup/include/restart_and_restore.inc b/mysql-test/suite/mariabackup/include/restart_and_restore.inc index 7ee4a660b78..9056867b07f 100644 --- a/mysql-test/suite/mariabackup/include/restart_and_restore.inc +++ b/mysql-test/suite/mariabackup/include/restart_and_restore.inc @@ -1,15 +1,9 @@ -let $_server_id= `SELECT @@server_id`; let $_datadir= `SELECT @@datadir`; -let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect; -exec echo "wait" > $_expect_file_name; echo # shutdown server; -shutdown_server; +--source include/shutdown_mysqld.inc echo # remove datadir; rmdir $_datadir; echo # xtrabackup move back; exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2 --throttle=1; echo # restart server; -exec echo "restart" > $_expect_file_name; -enable_reconnect; -source include/wait_until_connected_again.inc; -disable_reconnect; +--source include/start_mysqld.inc diff --git a/mysql-test/suite/mariabackup/xb_compressed_encrypted.test b/mysql-test/suite/mariabackup/xb_compressed_encrypted.test index 11f63eb0330..9a5be4b19d6 100644 --- a/mysql-test/suite/mariabackup/xb_compressed_encrypted.test +++ b/mysql-test/suite/mariabackup/xb_compressed_encrypted.test @@ -1,7 +1,7 @@ source include/have_file_key_management.inc; CREATE TABLE t1(c1 INT, b VARCHAR(2400), index(b(100),c1)) ENGINE=INNODB ROW_FORMAT=compressed ENCRYPTED=YES; - + DELIMITER //; CREATE PROCEDURE innodb_insert_proc (REPEAT_COUNT INT) BEGIN @@ -14,12 +14,12 @@ BEGIN END// DELIMITER ;// COMMIT; - + SET AUTOCOMMIT=0; CALL innodb_insert_proc(50000); COMMIT; - + echo # xtrabackup backup; --disable_result_log let $targetdir=$MYSQLTEST_VARDIR/tmp/backup; From b503b1c0edaa976e90b9bf3339677a710752e58a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 23 Jun 2017 15:14:22 +0200 Subject: [PATCH 041/102] MDEV-11646 main.myisam, maria.maria, main.mix2_myisam, main.myisampack, main.mrr_icp_extra fail in buildbot with valgrind (Syscall param pwrite64(buf) points to uninitialised byte(s)) If the table has a varchar column and a forced fixed for format (as in varchar.inc), Field_varstring::store() will only store the actual number of bytes, not padded, in the record[0]. That is, on inserts a part of record[0] can be uninitialized. Fix: initialize record[0] when a TABLE is created, it doesn't matter what kind of garbage can be in this unused/invisible part of the record, as long as it's not some random memory contents (that can contain sensitive data). --- sql/sql_insert.cc | 7 +------ sql/table.cc | 11 +---------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 88eb76ef1ed..e750e97194a 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -970,12 +970,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, be overwritten by fill_record() anyway (and fill_record() does not use default values in this case). */ -#ifdef HAVE_valgrind - if (table->file->ha_table_flags() && HA_RECORD_MUST_BE_CLEAN_ON_WRITE) - restore_record(table,s->default_values); // Get empty record - else -#endif - table->record[0][0]= share->default_values[0]; + table->record[0][0]= share->default_values[0]; /* Fix undefined null_bits. */ if (share->null_bytes > 1 && share->last_null_bit_pos) diff --git a/sql/table.cc b/sql/table.cc index a1e9ebfc0cc..3ab89897e07 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -4150,16 +4150,7 @@ void TABLE::init(THD *thd, TABLE_LIST *tl) DBUG_ASSERT(key_read == 0); - /* mark the record[0] uninitialized */ - TRASH(record[0], s->reclength); - - /* - Initialize the null marker bits, to ensure that if we are doing a read - of only selected columns (like in keyread), all null markers are - initialized. - */ - memset(record[0], 255, s->null_bytes); - memset(record[1], 255, s->null_bytes); + restore_record(this, s->default_values); /* Tables may be reused in a sub statement. */ DBUG_ASSERT(!file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN)); From 806d4e3127b8ceac4e1517139d40be0a9f85822f Mon Sep 17 00:00:00 2001 From: Jacob Mathew Date: Fri, 30 Jun 2017 16:17:29 -0700 Subject: [PATCH 042/102] Run spider mtr suites in 10.1 only on demand. --- storage/spider/mysql-test/spider/bg/suite.pm | 1 + storage/spider/mysql-test/spider/suite.pm | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/spider/mysql-test/spider/bg/suite.pm b/storage/spider/mysql-test/spider/bg/suite.pm index 5569c57bec9..1bb6d7592c8 100644 --- a/storage/spider/mysql-test/spider/bg/suite.pm +++ b/storage/spider/mysql-test/spider/bg/suite.pm @@ -4,6 +4,7 @@ package My::Suite::Spider; return "No Spider engine" unless $ENV{HA_SPIDER_SO}; return "Not run for embedded server" if $::opt_embedded_server; +return "Test needs --big-test" unless $::opt_big_test; bless { }; diff --git a/storage/spider/mysql-test/spider/suite.pm b/storage/spider/mysql-test/spider/suite.pm index 171fa6c4f01..1bb6d7592c8 100644 --- a/storage/spider/mysql-test/spider/suite.pm +++ b/storage/spider/mysql-test/spider/suite.pm @@ -4,8 +4,7 @@ package My::Suite::Spider; return "No Spider engine" unless $ENV{HA_SPIDER_SO}; return "Not run for embedded server" if $::opt_embedded_server; - -sub is_default { 1 } +return "Test needs --big-test" unless $::opt_big_test; bless { }; From da7604a2943f633df3b193e26ee20110bae9fa7a Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Sat, 1 Jul 2017 21:12:26 +0300 Subject: [PATCH 043/102] Latest additions to the list of unstable tests in 10.1.25 --- mysql-test/unstable-tests | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests index 9e7d4f7f76f..0aa1425ce4c 100644 --- a/mysql-test/unstable-tests +++ b/mysql-test/unstable-tests @@ -28,14 +28,19 @@ main.alter_table_trans : MDEV-12084 - timeout main.analyze_format_json : MDEV-11866 - Wrong result main.analyze_stmt_orderby : MDEV-11866 - Wrong result main.analyze_stmt_slow_query_log : MDEV-12237 - Wrong result +main.bootstrap : Modified in 10.1.25 main.create_delayed : MDEV-10605 - failed with timeout +main.ctype_ucs : Modified in 10.1.25 main.ctype_utf16le : MDEV-10675: timeout or extra warnings main.derived_view : Modified in 10.1.24 main.drop-no_root : MDEV-12633 - Valgrind warnings main.errors : MDEV-13179 - Wrong error 1290; modified in 10.1.25 main.events_bugs : MDEV-12892 - Crash in fill_schema_processlist main.events_restart : MDEV-12236 - Server shutdown problem +main.func_concat : Modified in 10.1.25 +main.func_crypt : Modified in 10.1.25 main.func_regexp_pcre : Modified in 10.1.25 +main.gis : Modified in 10.1.25 main.host_cache_size_functionality : MDEV-10606 - sporadic failure on shutdown main.index_intersect_innodb : MDEV-10643 - failed with timeout main.index_merge_innodb : MDEV-7142 - Wrong execution plan, timeout with valgrind @@ -48,9 +53,10 @@ main.mdev375 : MDEV-10607 - sporadic "can't connect" main.mdl_sync : Modified in 10.1.25 main.merge : MDEV-10607 - sporadic "can't connect" main.myisam_debug : Modified in 10.1.24 +main.mysql : Modified in 10.1.25 main.mysqlcheck : MDEV-12633 - Valgrind warnings main.mysqlslap : MDEV-11801 - timeout -main.mysqltest : MDEV-9269 - fails on Alpha; modified in 10.1.24 +main.mysqltest : MDEV-9269 - fails on Alpha; modified in 10.1.25 main.mysql_client_test : MDEV-12633 - Valgrind warnings main.mysql_client_test_comp : MDEV-12633 - Valgrind warnings main.mysql_client_test_nonblock : MDEV-12633 - Valgrind warnings @@ -69,9 +75,10 @@ main.show_explain : MDEV-10674 - sporadic failure main.sp-security : MDEV-10607 - sporadic "can't connect" main.status : MDEV-8510 - sporadic wrong result main.subselect_innodb : MDEV-10614 - sporadic wrong results -main.subselect_mat_cost_bugs : Modified in 10.1.24 +main.subselect_mat_cost_bugs : Modified in 10.1.25 main.subselect_sj : Modified in 10.1.24 -main.subselect_sj2_mat : Modified in 10.1.24 +main.subselect_sj_mat : Modified in 10.1.25 +main.subselect_sj2_mat : Modified in 10.1.25 main.symlink-aria-11902 : MDEV-12215 - Unexpected errors main.symlink-myisam-11902 : MDEV-12215 - Unexpected errors main.type_datetime_hires : MDEV-10687 - timeout @@ -143,6 +150,7 @@ federated.federatedx : MDEV-10617 - Wrong checksum, timeouts #---------------------------------------------------------------- funcs_1.processlist_val_no_prot : MDEV-11223 - Wrong result +funcs_1.processlist_val_ps : MDEV-12175 - Wrong plan funcs_2.memory_charset : MDEV-10290 - Timeout funcs_2.myisam_charset : MDEV-11535 - Timeout @@ -150,7 +158,7 @@ funcs_2.myisam_charset : MDEV-11535 - Timeout #---------------------------------------------------------------- galera.galera_autoinc_sst_xtrabackup : Config modified in 10.1.24 -galera.galera_defaults : Include file modified in 10.1.24 +galera.galera_defaults : Modified in 10.1.25 galera.galera_gcs_fc_limit : Modified in 10.1.24 galera.MW-369 : Added in 10.1.25 @@ -201,8 +209,14 @@ innodb_zip.innodb-zip : Modified in 10.1.25 mariabackup.* : suite.pm modified in 10.1.24 mariabackup.full_backup : Modified in 10.1.25 +mariabackup.incremental_backup : Uses include file modified in 10.1.25 mariabackup.incremental_encrypted : Modified in 10.1.25 +mariabackup.xb_aws_key_management : Uses include file modified in 10.1.25 +mariabackup.xb_compressed_encrypted : Modified in 10.1.25 mariabackup.xb_file_key_management : Modified in 10.1.25 +mariabackup.xb_fulltext_encrypted : Uses include file modified in 10.1.25 +mariabackup.xb_partition : Uses include file modified in 10.1.25 +mariabackup.xbstream : Uses include file modified in 10.1.25 #---------------------------------------------------------------- @@ -227,7 +241,8 @@ multi_source.status_vars : MDEV-4632 - failed while waiting for Slave_received_h #---------------------------------------------------------------- -parts.partition_innodb_status_file : MDEV-12901 - Valgrind +parts.partition_innodb_status_file : MDEV-12901 - Valgrind +parts.quoting : Modified in 10.1.25 #---------------------------------------------------------------- @@ -250,6 +265,11 @@ plugins.thread_pool_server_audit : MDEV-9562 - crashes on sol10-sparc #---------------------------------------------------------------- +roles.current_role_view-12666 : Added in 10.1.25 +roles.show_create_database-10463 : Added in 10.1.25 + +#---------------------------------------------------------------- + rpl.last_insert_id : MDEV-10625 - warnings in error log rpl.rpl_auto_increment : MDEV-10417 - Fails on Mips rpl.rpl_auto_increment_bug45679 : MDEV-10417 - Fails on Mips @@ -382,6 +402,6 @@ vcol.vcol_keys_innodb : MDEV-10639 - Testcase timeout wsrep.binlog_format : MDEV-11532 - WSREP has not yet prepared node wsrep.pool_of_threads : MDEV-12234 - Library problem on Power -wsrep.variables : Include file modified in 10.1.24 +wsrep.variables : Include file modified in 10.1.25 wsrep_info.plugin : MDEV-12909 - Wrong result From 007d3ed90513fa21182b3059b4bb7278fc425bd5 Mon Sep 17 00:00:00 2001 From: Lixun Peng Date: Mon, 3 Jul 2017 14:48:07 +0800 Subject: [PATCH 044/102] MDEV-12067 flashback does not correcly revert update/replace statements Problem ------- For one-statement contains multiple row events, Flashback didn't reverse the sequence of row events inside one-statement. Solution -------- Using a new array 'events_in_stmt' to store the row events of one-statement, when parsed the last one event, then print from the last one to the first one. In the same time, fixed another bug, without -vv will not insert the table_map into print_event_info->m_table_map, then change_to_flashback_event() will not execute because of Table_map_log_event is empty. --- client/mysqlbinlog.cc | 67 ++++++- mysql-test/suite/binlog/r/flashback.result | 201 ++++++++++++++++++-- mysql-test/suite/binlog/t/flashback.test | 209 +++++++++++++++++++-- sql/log_event.cc | 27 +-- sql/log_event.h | 2 + 5 files changed, 459 insertions(+), 47 deletions(-) diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 34e810f7b6b..584f6955453 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -68,6 +68,7 @@ CHARSET_INFO* system_charset_info= &my_charset_utf8_general_ci; /* Needed for Flashback */ DYNAMIC_ARRAY binlog_events; // Storing the events output string +DYNAMIC_ARRAY events_in_stmt; // Storing the events that in one statement String stop_event_string; // Storing the STOP_EVENT output string char server_version[SERVER_VERSION_LENGTH]; @@ -894,6 +895,25 @@ static bool print_row_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, print_event_info->m_table_map_ignored.get_table(table_id); bool skip_event= (ignored_map != NULL); + if (opt_flashback) + { + Rows_log_event *e= (Rows_log_event*) ev; + // The last Row_log_event will be the first event in Flashback + if (is_stmt_end) + e->clear_flags(Rows_log_event::STMT_END_F); + // The first Row_log_event will be the last event in Flashback + if (events_in_stmt.elements == 0) + e->set_flags(Rows_log_event::STMT_END_F); + // Update the temp_buf + e->update_flags(); + + if (insert_dynamic(&events_in_stmt, (uchar *) &ev)) + { + error("Out of memory: can't allocate memory to store the flashback events."); + exit(1); + } + } + /* end of statement check: i) destroy/free ignored maps @@ -945,7 +965,36 @@ static bool print_row_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, if (skip_event) return 0; - return print_base64(print_event_info, ev); + if (!opt_flashback) + return print_base64(print_event_info, ev); + else + { + if (is_stmt_end) + { + bool res= false; + Log_event *e= NULL; + + // Print the row_event from the last one to the first one + for (uint i= events_in_stmt.elements; i > 0; --i) + { + e= *(dynamic_element(&events_in_stmt, i - 1, Log_event**)); + res= res || print_base64(print_event_info, e); + } + // Copy all output into the Log_event + ev->output_buf.copy(e->output_buf); + // Delete Log_event + for (uint i= 0; i < events_in_stmt.elements-1; ++i) + { + e= *(dynamic_element(&events_in_stmt, i, Log_event**)); + delete e; + } + reset_dynamic(&events_in_stmt); + + return res; + } + } + + return 0; } @@ -1386,6 +1435,8 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, } if (print_base64(print_event_info, ev)) goto err; + if (opt_flashback) + reset_dynamic(&events_in_stmt); break; } case WRITE_ROWS_EVENT: @@ -1402,9 +1453,12 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, case DELETE_ROWS_COMPRESSED_EVENT_V1: { Rows_log_event *e= (Rows_log_event*) ev; + bool is_stmt_end= e->get_flags(Rows_log_event::STMT_END_F); if (print_row_event(print_event_info, ev, e->get_table_id(), e->get_flags(Rows_log_event::STMT_END_F))) goto err; + if (!is_stmt_end) + destroy_evt= FALSE; break; } case PRE_GA_WRITE_ROWS_EVENT: @@ -1412,9 +1466,12 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, case PRE_GA_UPDATE_ROWS_EVENT: { Old_rows_log_event *e= (Old_rows_log_event*) ev; + bool is_stmt_end= e->get_flags(Rows_log_event::STMT_END_F); if (print_row_event(print_event_info, ev, e->get_table_id(), e->get_flags(Old_rows_log_event::STMT_END_F))) goto err; + if (!is_stmt_end) + destroy_evt= FALSE; break; } case START_ENCRYPTION_EVENT: @@ -1459,7 +1516,7 @@ end: &my_charset_bin); else { - if (push_dynamic(&binlog_events, (uchar *) &tmp_str)) + if (insert_dynamic(&binlog_events, (uchar *) &tmp_str)) { error("Out of memory: can't allocate memory to store the flashback events."); exit(1); @@ -2915,9 +2972,12 @@ int main(int argc, char** argv) my_set_max_open_files(open_files_limit); if (opt_flashback) + { my_init_dynamic_array(&binlog_events, sizeof(LEX_STRING), 1024, 1024, MYF(0)); - + my_init_dynamic_array(&events_in_stmt, sizeof(Rows_log_event*), 1024, 1024, + MYF(0)); + } if (opt_stop_never) to_last_remote_log= TRUE; @@ -3031,6 +3091,7 @@ int main(int argc, char** argv) } fprintf(result_file, "COMMIT\n/*!*/;\n"); delete_dynamic(&binlog_events); + delete_dynamic(&events_in_stmt); } /* Set delimiter back to semicolon */ diff --git a/mysql-test/suite/binlog/r/flashback.result b/mysql-test/suite/binlog/r/flashback.result index ae8b583fc7a..96729d3bc3c 100644 --- a/mysql-test/suite/binlog/r/flashback.result +++ b/mysql-test/suite/binlog/r/flashback.result @@ -6,7 +6,7 @@ DROP TABLE IF EXISTS t1; # We need a fixed timestamp to avoid varying results. # SET timestamp=1000000000; -# +# < CASE 1 > # Delete all existing binary logs. # RESET MASTER; @@ -20,22 +20,22 @@ c06 char(10), c07 varchar(20), c08 TEXT ) ENGINE=InnoDB; -# +# < CASE 1 > # Insert data to t1 # INSERT INTO t1 VALUES(0,0,0,0,0,'','',''); INSERT INTO t1 VALUES(1,2,3,4,5, "abc", "abcdefg", "abcedfghijklmnopqrstuvwxyz"); INSERT INTO t1 VALUES(127, 32767, 8388607, 2147483647, 9223372036854775807, repeat('a', 10), repeat('a', 20), repeat('a', 255)); -# +# < CASE 1 > # Update t1 # UPDATE t1 SET c01=100 WHERE c02=0 OR c03=3; -# +# < CASE 1 > # Clear t1 # DELETE FROM t1; FLUSH LOGS; -# +# < CASE 1 > # Show mysqlbinlog result without -B # /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/; @@ -258,7 +258,7 @@ DELIMITER ; ROLLBACK /* added by mysqlbinlog */; /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/; -# +# < CASE 1 > # Show mysqlbinlog result with -B # /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/; @@ -426,14 +426,14 @@ DELIMITER ; ROLLBACK /* added by mysqlbinlog */; /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/; -# +# < CASE 1 > # Insert data to t1 # TRUNCATE TABLE t1; INSERT INTO t1 VALUES(0,0,0,0,0,'','',''); INSERT INTO t1 VALUES(1,2,3,4,5, "abc", "abcdefg", "abcedfghijklmnopqrstuvwxyz"); INSERT INTO t1 VALUES(127, 32767, 8388607, 2147483647, 9223372036854775807, repeat('a', 10), repeat('a', 20), repeat('a', 60)); -# +# < CASE 1 > # Delete all existing binary logs. # RESET MASTER; @@ -442,7 +442,7 @@ c01 c02 c03 c04 c05 c06 c07 c08 0 0 0 0 0 1 2 3 4 5 abc abcdefg abcedfghijklmnopqrstuvwxyz 127 32767 8388607 2147483647 9223372036854775807 aaaaaaaaaa aaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -# +# < CASE 1 > # Operate some data # UPDATE t1 SET c01=20; @@ -450,7 +450,7 @@ UPDATE t1 SET c02=200; UPDATE t1 SET c03=2000; DELETE FROM t1; FLUSH LOGS; -# +# < CASE 1 > # Flashback & Check the result # SELECT * FROM t1; @@ -459,7 +459,7 @@ c01 c02 c03 c04 c05 c06 c07 c08 1 2 3 4 5 abc abcdefg abcedfghijklmnopqrstuvwxyz 0 0 0 0 0 RESET MASTER; -# +# < CASE 2 > # UPDATE multi-rows in one event # BEGIN; @@ -467,7 +467,7 @@ UPDATE t1 SET c01=10 WHERE c01=0; UPDATE t1 SET c01=20 WHERE c01=10; COMMIT; FLUSH LOGS; -# +# < CASE 2 > # Flashback & Check the result # SELECT * FROM t1; @@ -476,7 +476,7 @@ c01 c02 c03 c04 c05 c06 c07 c08 1 2 3 4 5 abc abcdefg abcedfghijklmnopqrstuvwxyz 0 0 0 0 0 DROP TABLE t1; -# +# < CASE 3 > # Self-referencing foreign keys # CREATE TABLE t1 (a INT PRIMARY KEY, b INT, FOREIGN KEY my_fk(b) REFERENCES t1(a)) ENGINE=InnoDB; @@ -493,7 +493,7 @@ a b RESET MASTER; DELETE FROM t1 ORDER BY a DESC; FLUSH LOGS; -# +# < CASE 3 > # Flashback & Check the result # SELECT * FROM t1; @@ -502,9 +502,180 @@ a b 2 1 3 2 4 3 +DROP TABLE t1; +# < CASE 4 > +# Trigger +# +CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +BEGIN; +INSERT INTO t1 VALUES (1, NULL); +INSERT INTO t1 VALUES (2, 1), (3, 2), (4, 3); +INSERT INTO t2 VALUES (6, 7), (7, 8), (8, 9); +COMMIT; +SELECT * FROM t1; +a b +1 NULL +2 1 +3 2 +4 3 +SELECT * FROM t2; +a b +6 7 +7 8 +8 9 +CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW DELETE FROM t2 WHERE a = NEW.b; +RESET MASTER; +INSERT INTO t1 VALUES (5, 6), (7, 8); +SELECT * FROM t1; +a b +1 NULL +2 1 +3 2 +4 3 +5 6 +7 8 +SELECT * FROM t2; +a b +7 8 +FLUSH LOGS; +# < CASE 4 > +# Flashback & Check the result +# +SELECT * FROM t1; +a b +1 NULL +2 1 +3 2 +4 3 +SELECT * FROM t2; +a b +6 7 +7 8 +8 9 +DROP TRIGGER trg1; +DROP TABLE t1; +DROP TABLE t2; +# < CASE 5 > +# REPLCAE Queries +# +CREATE TABLE t1 (a INT PRIMARY KEY, b INT, UNIQUE uk(b)) ENGINE=InnoDB; +BEGIN; +INSERT INTO t1 VALUES (1, NULL); +INSERT INTO t1 VALUES (2, 1), (3, 2), (4, 3); +INSERT INTO t1 VALUES (5, 4), (6, 5), (7, 6); +COMMIT; +SELECT * FROM t1; +a b +1 NULL +2 1 +3 2 +4 3 +5 4 +6 5 +7 6 +RESET MASTER; +REPLACE INTO t1 VALUES (3, 100); +REPLACE INTO t1 SET a=4, b=200; +SELECT * FROM t1; +a b +1 NULL +2 1 +5 4 +6 5 +7 6 +3 100 +4 200 +REPLACE INTO t1 VALUES (5,5); +SELECT * FROM t1; +a b +1 NULL +2 1 +5 5 +7 6 +3 100 +4 200 +FLUSH LOGS; +# < CASE 5 > +# Flashback & Check the result +# +SELECT * FROM t1; +a b +1 NULL +2 1 +3 2 +4 3 +5 4 +6 5 +7 6 +DROP TABLE t1; +# < CASE 6 > +# Test Case from MDEV-21067 +# +CREATE DATABASE world; +CREATE TABLE world.City ( +ID INT AUTO_INCREMENT PRIMARY KEY, +Name VARCHAR(64), +CountryCode VARCHAR(64), +District VARCHAR(64), +Population INT +) ENGINE=InnoDB; +CREATE TABLE test.test ( +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); +RESET MASTER; +CHECKSUM TABLE world.City; +Table Checksum +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 test.test VALUES (NULL, 'Good record 2', CURRENT_TIMESTAMP()); +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; +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); +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 test.test VALUES (NULL, 'Good record 7', CURRENT_TIMESTAMP()); +INSERT INTO test.test VALUES (NULL, 'Good record 8', CURRENT_TIMESTAMP()); +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; +ID Name CountryCode District Population +1 Davenport USA Iowa 100 +2 Boulder USA Colorado 1000 +3 Gweru ZWE Midlands 10000 +SELECT * FROM test.test; +ID REC ts +1 Good record 1 2001-09-09 09:46:40 +2 Good record 2 2001-09-09 09:46:40 +3 Good record 3 2001-09-09 09:46:40 +4 Good record 5 2001-09-09 09:46:40 +5 Good record 6 2001-09-09 09:46:40 +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; +Table Checksum +world.City 563256876 +DROP TABLE test.test; +DROP TABLE world.City; +DROP DATABASE world; SET binlog_format=statement; Warnings: Warning 1105 MariaDB Galera and flashback do not support binlog format: STATEMENT SET GLOBAL binlog_format=statement; ERROR HY000: Flashback does not support binlog_format STATEMENT -DROP TABLE t1; diff --git a/mysql-test/suite/binlog/t/flashback.test b/mysql-test/suite/binlog/t/flashback.test index 8ef38dbcb9f..3636276a028 100644 --- a/mysql-test/suite/binlog/t/flashback.test +++ b/mysql-test/suite/binlog/t/flashback.test @@ -13,12 +13,11 @@ DROP TABLE IF EXISTS t1; --echo # SET timestamp=1000000000; ---echo # +--echo # < CASE 1 > --echo # Delete all existing binary logs. --echo # RESET MASTER; - CREATE TABLE t1 ( c01 tinyint, c02 smallint, @@ -30,7 +29,7 @@ CREATE TABLE t1 ( c08 TEXT ) ENGINE=InnoDB; ---echo # +--echo # < CASE 1 > --echo # Insert data to t1 --echo # INSERT INTO t1 VALUES(0,0,0,0,0,'','',''); @@ -38,19 +37,19 @@ INSERT INTO t1 VALUES(1,2,3,4,5, "abc", "abcdefg", "abcedfghijklmnopqrstuvwxyz") INSERT INTO t1 VALUES(127, 32767, 8388607, 2147483647, 9223372036854775807, repeat('a', 10), repeat('a', 20), repeat('a', 255)); ---echo # +--echo # < CASE 1 > --echo # Update t1 --echo # UPDATE t1 SET c01=100 WHERE c02=0 OR c03=3; ---echo # +--echo # < CASE 1 > --echo # Clear t1 --echo # DELETE FROM t1; FLUSH LOGS; ---echo # +--echo # < CASE 1 > --echo # Show mysqlbinlog result without -B --echo # @@ -59,7 +58,7 @@ let $MYSQLD_DATADIR= `select @@datadir`; --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /CRC32 0x[0-9a-f]*/CRC32 XXX/ --exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 ---echo # +--echo # < CASE 1 > --echo # Show mysqlbinlog result with -B --echo # @@ -68,7 +67,7 @@ let $MYSQLD_DATADIR= `select @@datadir`; --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /CRC32 0x[0-9a-f]*/CRC32 XXX/ --exec $MYSQL_BINLOG -B --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 ---echo # +--echo # < CASE 1 > --echo # Insert data to t1 --echo # TRUNCATE TABLE t1; @@ -76,13 +75,13 @@ INSERT INTO t1 VALUES(0,0,0,0,0,'','',''); INSERT INTO t1 VALUES(1,2,3,4,5, "abc", "abcdefg", "abcedfghijklmnopqrstuvwxyz"); INSERT INTO t1 VALUES(127, 32767, 8388607, 2147483647, 9223372036854775807, repeat('a', 10), repeat('a', 20), repeat('a', 60)); ---echo # +--echo # < CASE 1 > --echo # Delete all existing binary logs. --echo # RESET MASTER; SELECT * FROM t1; ---echo # +--echo # < CASE 1 > --echo # Operate some data --echo # @@ -94,12 +93,13 @@ DELETE FROM t1; FLUSH LOGS; ---echo # +--echo # < CASE 1 > --echo # Flashback & Check the result --echo # let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--exec $MYSQL_BINLOG -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_original_1.sql --exec $MYSQL_BINLOG -B -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_1.sql --exec $MYSQL -e "SET binlog_format= ROW; source $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_1.sql;" @@ -107,9 +107,10 @@ SELECT * FROM t1; RESET MASTER; ---echo # +--echo # < CASE 2 > --echo # UPDATE multi-rows in one event --echo # + BEGIN; UPDATE t1 SET c01=10 WHERE c01=0; UPDATE t1 SET c01=20 WHERE c01=10; @@ -117,12 +118,13 @@ COMMIT; FLUSH LOGS; ---echo # +--echo # < CASE 2 > --echo # Flashback & Check the result --echo # let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--exec $MYSQL_BINLOG -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_original_2.sql --exec $MYSQL_BINLOG -B -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_2.sql --exec $MYSQL -e "SET binlog_format= ROW; source $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_2.sql;" @@ -130,9 +132,10 @@ SELECT * FROM t1; DROP TABLE t1; ---echo # +--echo # < CASE 3 > --echo # Self-referencing foreign keys --echo # + CREATE TABLE t1 (a INT PRIMARY KEY, b INT, FOREIGN KEY my_fk(b) REFERENCES t1(a)) ENGINE=InnoDB; BEGIN; @@ -149,19 +152,191 @@ DELETE FROM t1 ORDER BY a DESC; FLUSH LOGS; ---echo # +--echo # < CASE 3 > --echo # Flashback & Check the result --echo # let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--exec $MYSQL_BINLOG -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_original_3.sql --exec $MYSQL_BINLOG -B -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_3.sql --exec $MYSQL -e "SET binlog_format= ROW; source $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_3.sql;" SELECT * FROM t1; +DROP TABLE t1; + +--echo # < CASE 4 > +--echo # Trigger +--echo # + +CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; + +BEGIN; +INSERT INTO t1 VALUES (1, NULL); +INSERT INTO t1 VALUES (2, 1), (3, 2), (4, 3); +INSERT INTO t2 VALUES (6, 7), (7, 8), (8, 9); +COMMIT; + +SELECT * FROM t1; +SELECT * FROM t2; + +CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW DELETE FROM t2 WHERE a = NEW.b; + +# New binlog +RESET MASTER; + +INSERT INTO t1 VALUES (5, 6), (7, 8); + +SELECT * FROM t1; +SELECT * FROM t2; + +FLUSH LOGS; + +--echo # < CASE 4 > +--echo # Flashback & Check the result +--echo # + +let $MYSQLD_DATADIR= `select @@datadir`; +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--exec $MYSQL_BINLOG -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_original_4.sql +--exec $MYSQL_BINLOG -B $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_4.sql +--exec $MYSQL -e "SET binlog_format= ROW; source $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_4.sql;" + +SELECT * FROM t1; +SELECT * FROM t2; + +DROP TRIGGER trg1; +DROP TABLE t1; +DROP TABLE t2; + +--echo # < CASE 5 > +--echo # REPLCAE Queries +--echo # + +CREATE TABLE t1 (a INT PRIMARY KEY, b INT, UNIQUE uk(b)) ENGINE=InnoDB; + +BEGIN; +INSERT INTO t1 VALUES (1, NULL); +INSERT INTO t1 VALUES (2, 1), (3, 2), (4, 3); +INSERT INTO t1 VALUES (5, 4), (6, 5), (7, 6); +COMMIT; + +SELECT * FROM t1; + +# New binlog +RESET MASTER; + +REPLACE INTO t1 VALUES (3, 100); +REPLACE INTO t1 SET a=4, b=200; + +SELECT * FROM t1; + +REPLACE INTO t1 VALUES (5,5); + +SELECT * FROM t1; + +FLUSH LOGS; + +--echo # < CASE 5 > +--echo # Flashback & Check the result +--echo # + +let $MYSQLD_DATADIR= `select @@datadir`; +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--exec $MYSQL_BINLOG -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_original_5.sql +--exec $MYSQL_BINLOG -B $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_5.sql +--exec $MYSQL -e "SET binlog_format= ROW; source $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_5.sql;" + +SELECT * FROM t1; + +DROP TABLE t1; + + +--echo # < CASE 6 > +--echo # Test Case from MDEV-21067 +--echo # + +# Init Structure +CREATE DATABASE world; +CREATE TABLE world.City ( + ID INT AUTO_INCREMENT PRIMARY KEY, + Name VARCHAR(64), + CountryCode VARCHAR(64), + District VARCHAR(64), + Population INT +) ENGINE=InnoDB; +CREATE TABLE test.test ( + 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); + +RESET MASTER; + +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 test.test VALUES (NULL, 'Good record 2', CURRENT_TIMESTAMP()); + +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; + +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); + +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 test.test VALUES (NULL, 'Good record 7', CURRENT_TIMESTAMP()); + +INSERT INTO test.test VALUES (NULL, 'Good record 8', CURRENT_TIMESTAMP()); + +DELETE FROM world.City; + +INSERT INTO test.test VALUES (NULL, 'Good record 9', CURRENT_TIMESTAMP()); + +FLUSH LOGS; + +--echo # < CASE 6 > +--echo # Flashback & Check the result +--echo # + +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 -e "SET binlog_format= ROW; source $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_6.sql;" + +SELECT * FROM world.City; + +SELECT * FROM test.test; + +CHECKSUM TABLE world.City; + +DROP TABLE test.test; +DROP TABLE world.City; +DROP DATABASE world; + +## Clear + SET binlog_format=statement; --error ER_FLASHBACK_NOT_SUPPORTED SET GLOBAL binlog_format=statement; - -DROP TABLE t1; diff --git a/sql/log_event.cc b/sql/log_event.cc index 6ff0211e536..79e8f7e0a94 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -3477,7 +3477,8 @@ void Log_event::print_base64(IO_CACHE* file, #ifdef WHEN_FLASHBACK_REVIEW_READY if (print_event_info->verbose || need_flashback_review) #else - if (print_event_info->verbose) + // Flashback need the table_map to parse the event + if (print_event_info->verbose || is_flashback) #endif { Rows_log_event *ev= NULL; @@ -3564,7 +3565,8 @@ void Log_event::print_base64(IO_CACHE* file, close_cached_file(&tmp_cache); } #else - ev->print_verbose(file, print_event_info); + if (print_event_info->verbose) + ev->print_verbose(file, print_event_info); #endif delete ev; } @@ -10251,6 +10253,7 @@ Rows_log_event::Rows_log_event(const char *buf, uint event_len, post_start+= RW_FLAGS_OFFSET; } + m_flags_pos= post_start - buf; m_flags= uint2korr(post_start); post_start+= 2; @@ -11299,18 +11302,18 @@ void Rows_log_event::print_helper(FILE *file, if (get_flags(STMT_END_F)) { - reinit_io_cache(head, READ_CACHE, 0L, FALSE, FALSE); - output_buf.append(head, head->end_of_file); - reinit_io_cache(head, WRITE_CACHE, 0, FALSE, TRUE); - - reinit_io_cache(body, READ_CACHE, 0L, FALSE, FALSE); - output_buf.append(body, body->end_of_file); - reinit_io_cache(body, WRITE_CACHE, 0, FALSE, TRUE); + LEX_STRING tmp_str; + copy_event_cache_to_string_and_reinit(head, &tmp_str); + output_buf.append(&tmp_str); + my_free(tmp_str.str); + copy_event_cache_to_string_and_reinit(body, &tmp_str); + output_buf.append(&tmp_str); + my_free(tmp_str.str); #ifdef WHEN_FLASHBACK_REVIEW_READY - reinit_io_cache(sql, READ_CACHE, 0L, FALSE, FALSE); - output_buf.append(sql, sql->end_of_file); - reinit_io_cache(sql, WRITE_CACHE, 0, FALSE, TRUE); + copy_event_cache_to_string_and_reinit(sql, &tmp_str); + output_buf.append(&tmp_str); + my_free(tmp_str.str); #endif } } diff --git a/sql/log_event.h b/sql/log_event.h index 6c6dce7e18e..a06781aebeb 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -4397,6 +4397,7 @@ public: void set_flags(flag_set flags_arg) { m_flags |= flags_arg; } void clear_flags(flag_set flags_arg) { m_flags &= ~flags_arg; } flag_set get_flags(flag_set flags_arg) const { return m_flags & flags_arg; } + void update_flags() { int2store(temp_buf + m_flags_pos, m_flags); } Log_event_type get_type_code() { return m_type; } /* Specific type (_V1 etc) */ virtual Log_event_type get_general_type_code() = 0; /* General rows op type, no version */ @@ -4555,6 +4556,7 @@ protected: uchar *m_rows_end; /* One-after the end of the allocated space */ size_t m_rows_before_size; /* The length before m_rows_buf */ + size_t m_flags_pos; /* The position of the m_flags */ flag_set m_flags; /* Flags for row-level events */ From 228479a28ce7e4c91f96962159fccc8dc71b5a36 Mon Sep 17 00:00:00 2001 From: Kristian Nielsen Date: Mon, 29 May 2017 11:35:36 +0300 Subject: [PATCH 045/102] MDEV-8075: DROP TEMPORARY TABLE not marked as ddl, causing optimistic parallel replication to fail CREATE/DROP TEMPORARY TABLE are not safe to optimistically replicate in parallel with other transactions, so they need to be marked as "ddl" in the binlog. This was already done for stand-alone CREATE/DROP TEMPORARY. But temporary tables can also be created and dropped inside a BEGIN...END transaction, and such transactions were not marked as ddl. Nor was the DROP TEMPORARY TABLE statement emitted implicitly when a client connection is closed. So this patch adds such ddl mark for the missing cases. The difference to Kristian's original patch is mainly a fix in mysql_trans_commit_alter_copy_data() to remember the unsafe_rollback_flags over the temporary commit. --- .../binlog_parallel_replication_marks.test | 85 ++++++++++++++++ ...nlog_parallel_replication_marks_row.result | 97 +++++++++++++++++++ ..._parallel_replication_marks_stm_mix.result | 96 ++++++++++++++++++ ...binlog_parallel_replication_marks_row.test | 3 + ...og_parallel_replication_marks_stm_mix.test | 3 + .../rpl/r/rpl_parallel_optimistic.result | 47 +++++++++ .../suite/rpl/t/rpl_parallel_optimistic.test | 24 +++++ sql/handler.h | 14 +++ sql/log_event.cc | 6 +- sql/sql_base.cc | 1 + sql/sql_class.h | 10 ++ sql/sql_insert.cc | 9 ++ sql/sql_parse.cc | 4 +- sql/sql_table.cc | 27 ++++-- sql/transaction.cc | 29 +++--- 15 files changed, 429 insertions(+), 26 deletions(-) create mode 100644 mysql-test/include/binlog_parallel_replication_marks.test create mode 100644 mysql-test/suite/binlog/r/binlog_parallel_replication_marks_row.result create mode 100644 mysql-test/suite/binlog/r/binlog_parallel_replication_marks_stm_mix.result create mode 100644 mysql-test/suite/binlog/t/binlog_parallel_replication_marks_row.test create mode 100644 mysql-test/suite/binlog/t/binlog_parallel_replication_marks_stm_mix.test diff --git a/mysql-test/include/binlog_parallel_replication_marks.test b/mysql-test/include/binlog_parallel_replication_marks.test new file mode 100644 index 00000000000..1b6fbe26142 --- /dev/null +++ b/mysql-test/include/binlog_parallel_replication_marks.test @@ -0,0 +1,85 @@ +# Test the markings on GTID events (ddl, waited, trans, +# @@skip_parallel_replication) that are used to control parallel +# replication on the slave. + +--source include/have_innodb.inc + +RESET MASTER; +--source include/wait_for_binlog_checkpoint.inc + +set time_zone="+02:00"; +--let $stable_stamp= `SELECT UNIX_TIMESTAMP("2020-01-21 15:32:22")` +eval set timestamp=$stable_stamp; + +CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +--let $binlog_pos1=query_get_value(SHOW MASTER STATUS, Position, 1) +/* GTID */ INSERT INTO t1 VALUES (1,0); +/* GTID */ BEGIN; +/* GTID */ INSERT INTO t1 VALUES (2,0); +/* GTID */ ALTER TABLE t1 ADD c INT; +/* GTID */ INSERT INTO t1 VALUES (3,0,0); +/* GTID */ COMMIT; +/* GTID */ BEGIN; +/* GTID */ UPDATE t1 SET b=1, c=1 WHERE a=2; +/* GTID */ CREATE TEMPORARY TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +/* GTID */ INSERT INTO t2 VALUES (4,10), (5,20); +/* GTID */ INSERT INTO t1 SELECT a, 2, b FROM t2; +/* GTID */ DROP TEMPORARY TABLE t2; +/* GTID */ INSERT INTO t1 VALUES (6, 3, 0); +/* GTID */ COMMIT; +/* GTID */ CREATE TEMPORARY TABLE t3 (a INT PRIMARY KEY) ENGINE=InnoDB; +/* GTID */ BEGIN; +/* GTID */ DELETE FROM t1 WHERE a=5; +/* GTID */ INSERT INTO t3 VALUES (7); +/* GTID */ INSERT INTO t1 SELECT a, 4, 0 FROM t3; +/* GTID */ UPDATE t1 SET c=1 WHERE a=7; +/* GTID */ DROP TEMPORARY TABLE t3; +/* GTID */ COMMIT; +/* GTID */ CREATE TEMPORARY TABLE t4 (a INT PRIMARY KEY) ENGINE=InnoDB; +/* GTID */ BEGIN; +/* GTID */ INSERT INTO t1 VALUES (8, 5, 0); +/* GTID */ ALTER TABLE t4 ADD b INT; +/* GTID */ INSERT INTO t1 VALUES (9, 5, 1); +/* GTID */ COMMIT; +connect (tmp_con,localhost,root,,); +eval set timestamp=$stable_stamp; +/* GTID */ INSERT INTO t1 VALUES (10, 6, 0); +/* GTID */ BEGIN; +/* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB; +/* GTID */ INSERT INTO t1 VALUES (11, 7, 0); +/* GTID */ COMMIT; +--let $before_drop_pos=query_get_value(SHOW MASTER STATUS, Position, 1) +disconnect tmp_con; +connection default; + +# We need to wait for the implicit DROP TEMPORARY TABLE to be logged after +# tmp_con disconnect, otherwise we get sporadic test failures. +--let $wait_condition= SELECT variable_value > $before_drop_pos FROM information_schema.global_status WHERE variable_name = 'binlog_snapshot_position' +--source include/wait_condition.inc + +--let $binlog_pos2=query_get_value(SHOW MASTER STATUS, Position, 1) + +--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1) +FLUSH LOGS; + +--let $MYSQLD_DATADIR= `select @@datadir` +--let $file= $MYSQLTEST_VARDIR/tmp/binlog_parallel_replication_marks.out +--let OUTPUT_FILE=$file +exec $MYSQL_BINLOG --start_position=$binlog_pos1 --stop_position=$binlog_pos2 $MYSQLD_DATADIR/$binlog_file > $file; + +perl; +my $file= $ENV{'OUTPUT_FILE'}; +open F, "<", $file + or die "Unable to open file '$file': $!\n"; +while () { + s/^#\d+ \d+:\d+:\d+ /# /; + s/GTID \d+-\d+-\d+/GTID #-#-#/; + s/end_log_pos \d+/end_log_pos #/; + s/table id \d+/table id #/; + s/mapped to number \d+/mapped to number #/; + print if /GTID|BEGIN|COMMIT|Table_map|Write_rows|Update_rows|Delete_rows|generated by server|40005 TEMPORARY/; +} +close F; +EOF + +DROP TABLE t1; diff --git a/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_row.result b/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_row.result new file mode 100644 index 00000000000..b0bba30bd00 --- /dev/null +++ b/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_row.result @@ -0,0 +1,97 @@ +RESET MASTER; +set time_zone="+02:00"; +set timestamp=1579613542; +CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +/* GTID */ INSERT INTO t1 VALUES (1,0); +/* GTID */ BEGIN; +/* GTID */ INSERT INTO t1 VALUES (2,0); +/* GTID */ ALTER TABLE t1 ADD c INT; +/* GTID */ INSERT INTO t1 VALUES (3,0,0); +/* GTID */ COMMIT; +/* GTID */ BEGIN; +/* GTID */ UPDATE t1 SET b=1, c=1 WHERE a=2; +/* GTID */ CREATE TEMPORARY TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +/* GTID */ INSERT INTO t2 VALUES (4,10), (5,20); +/* GTID */ INSERT INTO t1 SELECT a, 2, b FROM t2; +/* GTID */ DROP TEMPORARY TABLE t2; +/* GTID */ INSERT INTO t1 VALUES (6, 3, 0); +/* GTID */ COMMIT; +/* GTID */ CREATE TEMPORARY TABLE t3 (a INT PRIMARY KEY) ENGINE=InnoDB; +/* GTID */ BEGIN; +/* GTID */ DELETE FROM t1 WHERE a=5; +/* GTID */ INSERT INTO t3 VALUES (7); +/* GTID */ INSERT INTO t1 SELECT a, 4, 0 FROM t3; +/* GTID */ UPDATE t1 SET c=1 WHERE a=7; +/* GTID */ DROP TEMPORARY TABLE t3; +/* GTID */ COMMIT; +/* GTID */ CREATE TEMPORARY TABLE t4 (a INT PRIMARY KEY) ENGINE=InnoDB; +/* GTID */ BEGIN; +/* GTID */ INSERT INTO t1 VALUES (8, 5, 0); +/* GTID */ ALTER TABLE t4 ADD b INT; +/* GTID */ INSERT INTO t1 VALUES (9, 5, 1); +/* GTID */ COMMIT; +set timestamp=1579613542; +/* GTID */ INSERT INTO t1 VALUES (10, 6, 0); +/* GTID */ BEGIN; +/* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB; +/* GTID */ INSERT INTO t1 VALUES (11, 7, 0); +/* GTID */ COMMIT; +FLUSH LOGS; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# ddl +/* GTID */ ALTER TABLE t1 ADD c INT +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Update_rows: table id # flags: STMT_END_F +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Delete_rows: table id # flags: STMT_END_F +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Update_rows: table id # flags: STMT_END_F +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +# server id 1 end_log_pos # Table_map: `test`.`t1` mapped to number # +# server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# ddl +DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t5` +DROP TABLE t1; diff --git a/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_stm_mix.result b/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_stm_mix.result new file mode 100644 index 00000000000..c5dffff7446 --- /dev/null +++ b/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_stm_mix.result @@ -0,0 +1,96 @@ +RESET MASTER; +set time_zone="+02:00"; +set timestamp=1579613542; +CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +/* GTID */ INSERT INTO t1 VALUES (1,0); +/* GTID */ BEGIN; +/* GTID */ INSERT INTO t1 VALUES (2,0); +/* GTID */ ALTER TABLE t1 ADD c INT; +/* GTID */ INSERT INTO t1 VALUES (3,0,0); +/* GTID */ COMMIT; +/* GTID */ BEGIN; +/* GTID */ UPDATE t1 SET b=1, c=1 WHERE a=2; +/* GTID */ CREATE TEMPORARY TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +/* GTID */ INSERT INTO t2 VALUES (4,10), (5,20); +/* GTID */ INSERT INTO t1 SELECT a, 2, b FROM t2; +/* GTID */ DROP TEMPORARY TABLE t2; +/* GTID */ INSERT INTO t1 VALUES (6, 3, 0); +/* GTID */ COMMIT; +/* GTID */ CREATE TEMPORARY TABLE t3 (a INT PRIMARY KEY) ENGINE=InnoDB; +/* GTID */ BEGIN; +/* GTID */ DELETE FROM t1 WHERE a=5; +/* GTID */ INSERT INTO t3 VALUES (7); +/* GTID */ INSERT INTO t1 SELECT a, 4, 0 FROM t3; +/* GTID */ UPDATE t1 SET c=1 WHERE a=7; +/* GTID */ DROP TEMPORARY TABLE t3; +/* GTID */ COMMIT; +/* GTID */ CREATE TEMPORARY TABLE t4 (a INT PRIMARY KEY) ENGINE=InnoDB; +/* GTID */ BEGIN; +/* GTID */ INSERT INTO t1 VALUES (8, 5, 0); +/* GTID */ ALTER TABLE t4 ADD b INT; +/* GTID */ INSERT INTO t1 VALUES (9, 5, 1); +/* GTID */ COMMIT; +set timestamp=1579613542; +/* GTID */ INSERT INTO t1 VALUES (10, 6, 0); +/* GTID */ BEGIN; +/* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB; +/* GTID */ INSERT INTO t1 VALUES (11, 7, 0); +/* GTID */ COMMIT; +FLUSH LOGS; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +/* GTID */ INSERT INTO t1 VALUES (1,0) +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +/* GTID */ INSERT INTO t1 VALUES (2,0) +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# ddl +/* GTID */ ALTER TABLE t1 ADD c INT +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +/* GTID */ INSERT INTO t1 VALUES (3,0,0) +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# ddl +BEGIN +/* GTID */ UPDATE t1 SET b=1, c=1 WHERE a=2 +/* GTID */ CREATE TEMPORARY TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB +/* GTID */ INSERT INTO t2 VALUES (4,10), (5,20) +/* GTID */ INSERT INTO t1 SELECT a, 2, b FROM t2 +DROP TEMPORARY TABLE `t2` /* generated by server */ +/* GTID */ INSERT INTO t1 VALUES (6, 3, 0) +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# ddl +/* GTID */ CREATE TEMPORARY TABLE t3 (a INT PRIMARY KEY) ENGINE=InnoDB +# server id 1 end_log_pos # GTID #-#-# ddl +BEGIN +/* GTID */ DELETE FROM t1 WHERE a=5 +/* GTID */ INSERT INTO t3 VALUES (7) +/* GTID */ INSERT INTO t1 SELECT a, 4, 0 FROM t3 +/* GTID */ UPDATE t1 SET c=1 WHERE a=7 +DROP TEMPORARY TABLE `t3` /* generated by server */ +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# ddl +/* GTID */ CREATE TEMPORARY TABLE t4 (a INT PRIMARY KEY) ENGINE=InnoDB +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +/* GTID */ INSERT INTO t1 VALUES (8, 5, 0) +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# ddl +/* GTID */ ALTER TABLE t4 ADD b INT +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +/* GTID */ INSERT INTO t1 VALUES (9, 5, 1) +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# trans +BEGIN +/* GTID */ INSERT INTO t1 VALUES (10, 6, 0) +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# ddl +BEGIN +/* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB +/* GTID */ INSERT INTO t1 VALUES (11, 7, 0) +COMMIT/*!*/; +# server id 1 end_log_pos # GTID #-#-# ddl +DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t5` +DROP TABLE t1; diff --git a/mysql-test/suite/binlog/t/binlog_parallel_replication_marks_row.test b/mysql-test/suite/binlog/t/binlog_parallel_replication_marks_row.test new file mode 100644 index 00000000000..82898486089 --- /dev/null +++ b/mysql-test/suite/binlog/t/binlog_parallel_replication_marks_row.test @@ -0,0 +1,3 @@ +--source include/have_log_bin.inc +--source include/have_binlog_format_row.inc +--source include/binlog_parallel_replication_marks.test diff --git a/mysql-test/suite/binlog/t/binlog_parallel_replication_marks_stm_mix.test b/mysql-test/suite/binlog/t/binlog_parallel_replication_marks_stm_mix.test new file mode 100644 index 00000000000..15042b3a07f --- /dev/null +++ b/mysql-test/suite/binlog/t/binlog_parallel_replication_marks_stm_mix.test @@ -0,0 +1,3 @@ +--source include/have_log_bin.inc +--source include/have_binlog_format_mixed_or_statement.inc +--source include/binlog_parallel_replication_marks.test diff --git a/mysql-test/suite/rpl/r/rpl_parallel_optimistic.result b/mysql-test/suite/rpl/r/rpl_parallel_optimistic.result index fc8a5edc997..0177e65b10f 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_optimistic.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_optimistic.result @@ -496,6 +496,53 @@ a b 57 7 58 8 59 9 +*** MDEV-8075: DROP TEMPORARY TABLE not marked as ddl, causing optimistic parallel replication to fail *** +include/stop_slave.inc +INSERT INTO t1 VALUES (40, 10); +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (41); +BEGIN; +INSERT INTO t2 SELECT a, 20 FROM t1; +DROP TEMPORARY TABLE t1; +COMMIT; +INSERT INTO t1 VALUES (42, 10); +include/save_master_gtid.inc +SELECT * FROM t1 WHERE a >= 40 ORDER BY a; +a b +40 10 +42 10 +SELECT * FROM t2 WHERE a >= 40 ORDER BY a; +a b +41 20 +50 0 +51 1 +52 2 +53 3 +54 4 +55 5 +56 6 +57 7 +58 8 +59 9 +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 WHERE a >= 40 ORDER BY a; +a b +40 10 +42 10 +SELECT * FROM t2 WHERE a >= 40 ORDER BY a; +a b +41 20 +50 0 +51 1 +52 2 +53 3 +54 4 +55 5 +56 6 +57 7 +58 8 +59 9 include/stop_slave.inc SET GLOBAL slave_parallel_mode=@old_parallel_mode; SET GLOBAL slave_parallel_threads=@old_parallel_threads; diff --git a/mysql-test/suite/rpl/t/rpl_parallel_optimistic.test b/mysql-test/suite/rpl/t/rpl_parallel_optimistic.test index 93dfe4d5e7c..41fb6ebb72e 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_optimistic.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_optimistic.test @@ -456,6 +456,30 @@ SELECT * FROM t2 WHERE a >= 50 ORDER BY a; SELECT * FROM t2 WHERE a >= 50 ORDER BY a; +--echo *** MDEV-8075: DROP TEMPORARY TABLE not marked as ddl, causing optimistic parallel replication to fail *** + +--connection server_2 +--source include/stop_slave.inc + +--connection server_1 +INSERT INTO t1 VALUES (40, 10); +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (41); +BEGIN; +INSERT INTO t2 SELECT a, 20 FROM t1; +DROP TEMPORARY TABLE t1; +COMMIT; +INSERT INTO t1 VALUES (42, 10); +--source include/save_master_gtid.inc +SELECT * FROM t1 WHERE a >= 40 ORDER BY a; +SELECT * FROM t2 WHERE a >= 40 ORDER BY a; + +--connection server_2 +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 WHERE a >= 40 ORDER BY a; +SELECT * FROM t2 WHERE a >= 40 ORDER BY a; + # Clean up. --connection server_2 diff --git a/sql/handler.h b/sql/handler.h index dad2b81b39c..1d4dded3971 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1470,16 +1470,30 @@ struct THD_TRANS static unsigned int const CREATED_TEMP_TABLE= 0x02; static unsigned int const DROPPED_TEMP_TABLE= 0x04; static unsigned int const DID_WAIT= 0x08; + static unsigned int const DID_DDL= 0x10; void mark_created_temp_table() { DBUG_PRINT("debug", ("mark_created_temp_table")); m_unsafe_rollback_flags|= CREATED_TEMP_TABLE; } + void mark_dropped_temp_table() + { + DBUG_PRINT("debug", ("mark_dropped_temp_table")); + m_unsafe_rollback_flags|= DROPPED_TEMP_TABLE; + } + bool has_created_dropped_temp_table() const { + return + (m_unsafe_rollback_flags & (CREATED_TEMP_TABLE|DROPPED_TEMP_TABLE)) != 0; + } void mark_trans_did_wait() { m_unsafe_rollback_flags|= DID_WAIT; } bool trans_did_wait() const { return (m_unsafe_rollback_flags & DID_WAIT) != 0; } + void mark_trans_did_ddl() { m_unsafe_rollback_flags|= DID_DDL; } + bool trans_did_ddl() const { + return (m_unsafe_rollback_flags & DID_DDL) != 0; + } }; diff --git a/sql/log_event.cc b/sql/log_event.cc index f098664b1ba..4265a23df2b 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -6635,8 +6635,10 @@ Gtid_log_event::Gtid_log_event(THD *thd_arg, uint64 seq_no_arg, if (thd_arg->transaction.stmt.trans_did_wait() || thd_arg->transaction.all.trans_did_wait()) flags2|= FL_WAITED; - if (sql_command_flags[thd->lex->sql_command] & - (CF_DISALLOW_IN_RO_TRANS | CF_AUTO_COMMIT_TRANS)) + if (thd_arg->transaction.stmt.trans_did_ddl() || + thd_arg->transaction.stmt.has_created_dropped_temp_table() || + thd_arg->transaction.all.trans_did_ddl() || + thd_arg->transaction.all.has_created_dropped_temp_table()) flags2|= FL_DDL; else if (is_transactional) flags2|= FL_TRANSACTIONAL; diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 9c56b7d8f22..ae10c0b771d 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1245,6 +1245,7 @@ bool close_temporary_tables(THD *thd) thd->variables.character_set_client= cs_save; thd->get_stmt_da()->set_overwrite_status(true); + thd->transaction.stmt.mark_dropped_temp_table(); if ((error= (mysql_bin_log.write(&qinfo) || error))) { /* diff --git a/sql/sql_class.h b/sql/sql_class.h index db1214ab26b..342902363c6 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -4048,6 +4048,16 @@ public: { main_lex.restore_set_statement_var(); } + /* Copy relevant `stmt` transaction flags to `all` transaction. */ + void merge_unsafe_rollback_flags() + { + if (transaction.stmt.modified_non_trans_table) + transaction.all.modified_non_trans_table= TRUE; + transaction.all.m_unsafe_rollback_flags|= + (transaction.stmt.m_unsafe_rollback_flags & + (THD_TRANS::DID_WAIT | THD_TRANS::CREATED_TEMP_TABLE | + THD_TRANS::DROPPED_TEMP_TABLE | THD_TRANS::DID_DDL)); + } }; diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index e750e97194a..092b2154c61 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -4360,6 +4360,15 @@ void select_create::store_values(List &values) bool select_create::send_eof() { DBUG_ENTER("select_create::send_eof"); + + /* + The routine that writes the statement in the binary log + is in select_insert::prepare_eof(). For that reason, we + mark the flag at this point. + */ + if (table->s->tmp_table) + thd->transaction.stmt.mark_created_temp_table(); + if (prepare_eof()) { abort_result_set(); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 62d73f5306a..c4b32933b8a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2847,6 +2847,7 @@ mysql_execute_command(THD *thd) goto error; } } + thd->transaction.stmt.mark_trans_did_ddl(); } #ifndef DBUG_OFF @@ -6936,8 +6937,7 @@ void THD::reset_for_next_command() if (!thd->in_multi_stmt_transaction_mode()) { thd->variables.option_bits&= ~OPTION_KEEP_LOG; - thd->transaction.all.modified_non_trans_table= FALSE; - thd->transaction.all.m_unsafe_rollback_flags&= ~THD_TRANS::DID_WAIT; + thd->transaction.all.reset(); } DBUG_ASSERT(thd->security_ctx== &thd->main_security_ctx); thd->thread_specific_used= FALSE; diff --git a/sql/sql_table.cc b/sql/sql_table.cc index db0d6d4f377..ace8ff1a7a9 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2560,6 +2560,9 @@ err: if (non_trans_tmp_table_deleted || trans_tmp_table_deleted || non_tmp_table_deleted) { + if (non_trans_tmp_table_deleted || trans_tmp_table_deleted) + thd->transaction.stmt.mark_dropped_temp_table(); + query_cache_invalidate3(thd, tables, 0); if (!dont_log_query && mysql_bin_log.is_open()) { @@ -5073,6 +5076,9 @@ err: if (thd->is_current_stmt_binlog_format_row() && create_info->tmp_table()) DBUG_RETURN(result); + if (create_info->tmp_table()) + thd->transaction.stmt.mark_created_temp_table(); + /* Write log if no error or if we already deleted a table */ if (!result || thd->log_current_statement) { @@ -5567,13 +5573,17 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, DBUG_PRINT("info", ("res: %d tmp_table: %d create_info->table: %p", res, create_info->tmp_table(), local_create_info.table)); - if (!res && create_info->tmp_table() && local_create_info.table) + if (create_info->tmp_table()) { - /* - Remember that tmp table creation was logged so that we know if - we should log a delete of it. - */ - local_create_info.table->s->table_creation_was_logged= 1; + thd->transaction.stmt.mark_created_temp_table(); + if (!res && local_create_info.table) + { + /* + Remember that tmp table creation was logged so that we know if + we should log a delete of it. + */ + local_create_info.table->s->table_creation_was_logged= 1; + } } do_logging= TRUE; } @@ -9366,8 +9376,12 @@ bool mysql_trans_prepare_alter_copy_data(THD *thd) bool mysql_trans_commit_alter_copy_data(THD *thd) { bool error= FALSE; + uint save_unsafe_rollback_flags; DBUG_ENTER("mysql_trans_commit_alter_copy_data"); + /* Save flags as transcommit_implicit_are_deleting_them */ + save_unsafe_rollback_flags= thd->transaction.stmt.m_unsafe_rollback_flags; + if (ha_enable_transaction(thd, TRUE)) DBUG_RETURN(TRUE); @@ -9382,6 +9396,7 @@ bool mysql_trans_commit_alter_copy_data(THD *thd) if (trans_commit_implicit(thd)) error= TRUE; + thd->transaction.stmt.m_unsafe_rollback_flags= save_unsafe_rollback_flags; DBUG_RETURN(error); } diff --git a/sql/transaction.cc b/sql/transaction.cc index 8b188709ce6..f03cced7bc8 100644 --- a/sql/transaction.cc +++ b/sql/transaction.cc @@ -151,11 +151,10 @@ bool trans_begin(THD *thd, uint flags) thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); /* - The following set should not be needed as the flag should always be 0 - when we come here. We should at some point change this to an assert. + The following set should not be needed as transaction state should + already be reset. We should at some point change this to an assert. */ - thd->transaction.all.modified_non_trans_table= FALSE; - thd->transaction.all.m_unsafe_rollback_flags&= ~THD_TRANS::DID_WAIT; + thd->transaction.all.reset(); thd->has_waiter= false; thd->waiting_on_group_commit= false; @@ -251,8 +250,7 @@ bool trans_commit(THD *thd) else (void) RUN_HOOK(transaction, after_commit, (thd, FALSE)); thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); - thd->transaction.all.modified_non_trans_table= FALSE; - thd->transaction.all.m_unsafe_rollback_flags&= ~THD_TRANS::DID_WAIT; + thd->transaction.all.reset(); thd->lex->start_transaction_opt= 0; DBUG_RETURN(MY_TEST(res)); @@ -299,8 +297,7 @@ bool trans_commit_implicit(THD *thd) } thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); - thd->transaction.all.modified_non_trans_table= FALSE; - thd->transaction.all.m_unsafe_rollback_flags&= ~THD_TRANS::DID_WAIT; + thd->transaction.all.reset(); /* Upon implicit commit, reset the current transaction @@ -345,8 +342,7 @@ bool trans_rollback(THD *thd) thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); /* Reset the binlog transaction marker */ thd->variables.option_bits&= ~OPTION_GTID_BEGIN; - thd->transaction.all.modified_non_trans_table= FALSE; - thd->transaction.all.m_unsafe_rollback_flags&= ~THD_TRANS::DID_WAIT; + thd->transaction.all.reset(); thd->lex->start_transaction_opt= 0; DBUG_RETURN(MY_TEST(res)); @@ -390,8 +386,7 @@ bool trans_rollback_implicit(THD *thd) preserve backward compatibility. */ thd->variables.option_bits&= ~(OPTION_KEEP_LOG); - thd->transaction.all.modified_non_trans_table= false; - thd->transaction.all.m_unsafe_rollback_flags&= ~THD_TRANS::DID_WAIT; + thd->transaction.all.reset(); /* Rollback should clear transaction_rollback_request flag. */ DBUG_ASSERT(! thd->transaction_rollback_request); @@ -427,6 +422,8 @@ bool trans_commit_stmt(THD *thd) */ DBUG_ASSERT(! thd->in_sub_stmt); + thd->merge_unsafe_rollback_flags(); + if (thd->transaction.stmt.ha_list) { if (WSREP_ON) @@ -481,6 +478,8 @@ bool trans_rollback_stmt(THD *thd) */ DBUG_ASSERT(! thd->in_sub_stmt); + thd->merge_unsafe_rollback_flags(); + if (thd->transaction.stmt.ha_list) { if (WSREP_ON) @@ -904,8 +903,7 @@ bool trans_xa_commit(THD *thd) } thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); - thd->transaction.all.modified_non_trans_table= FALSE; - thd->transaction.all.m_unsafe_rollback_flags&= ~THD_TRANS::DID_WAIT; + thd->transaction.all.reset(); thd->server_status&= ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY); DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS")); @@ -960,8 +958,7 @@ bool trans_xa_rollback(THD *thd) res= xa_trans_force_rollback(thd); thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); - thd->transaction.all.modified_non_trans_table= FALSE; - thd->transaction.all.m_unsafe_rollback_flags&= ~THD_TRANS::DID_WAIT; + thd->transaction.all.reset(); thd->server_status&= ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY); DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS")); From f8dadbdf241a5400a9180f03cab4dbf25206bf7c Mon Sep 17 00:00:00 2001 From: Monty Date: Sun, 4 Jun 2017 11:47:30 +0300 Subject: [PATCH 046/102] Ensure that we have LOG_log locked when relay_log.close is called If open of the relay log failed, we got an assert in MYSQL_BIN_LOG::close This only affected DEBUG systems --- sql/rpl_rli.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 1b969fb4257..363f114ce9a 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -122,11 +122,14 @@ int init_relay_log_info(Relay_log_info* rli, int info_fd; const char* msg = 0; int error = 0; + mysql_mutex_t *log_lock; DBUG_ENTER("init_relay_log_info"); DBUG_ASSERT(!rli->no_storage); // Don't init if there is no storage if (rli->inited) // Set if this function called DBUG_RETURN(0); + + log_lock= rli->relay_log.get_log_lock(); fn_format(fname, info_fname, mysql_data_home, "", 4+32); mysql_mutex_lock(&rli->data_lock); info_fd = rli->info_fd; @@ -208,7 +211,6 @@ a file name for --relay-log-index option", opt_relaylog_index_name); Master_info* mi= rli->mi; char buf_relay_logname[FN_REFLEN], buf_relaylog_index_name_buff[FN_REFLEN]; char *buf_relaylog_index_name= opt_relaylog_index_name; - mysql_mutex_t *log_lock; create_logfile_name_with_suffix(buf_relay_logname, sizeof(buf_relay_logname), @@ -228,7 +230,6 @@ a file name for --relay-log-index option", opt_relaylog_index_name); note, that if open() fails, we'll still have index file open but a destructor will take care of that */ - log_lock= rli->relay_log.get_log_lock(); mysql_mutex_lock(log_lock); if (rli->relay_log.open_index_file(buf_relaylog_index_name, ln, TRUE) || rli->relay_log.open(ln, LOG_BIN, 0, 0, SEQ_READ_APPEND, @@ -306,7 +307,9 @@ Failed to open the existing relay log info file '%s' (errno %d)", if (info_fd >= 0) mysql_file_close(info_fd, MYF(0)); rli->info_fd= -1; + mysql_mutex_lock(log_lock); rli->relay_log.close(LOG_CLOSE_INDEX | LOG_CLOSE_STOP_EVENT); + mysql_mutex_unlock(log_lock); mysql_mutex_unlock(&rli->data_lock); DBUG_RETURN(1); } @@ -437,8 +440,12 @@ err: if (info_fd >= 0) mysql_file_close(info_fd, MYF(0)); rli->info_fd= -1; + + mysql_mutex_lock(log_lock); rli->relay_log.close(LOG_CLOSE_INDEX | LOG_CLOSE_STOP_EVENT); + mysql_mutex_unlock(log_lock); mysql_mutex_unlock(&rli->data_lock); + DBUG_RETURN(1); } From 8ae9c86f2a79f1301f5428542fc7f53feed7d4f4 Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Tue, 4 Jul 2017 10:26:14 -0400 Subject: [PATCH 047/102] bump the VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index aa7108a440a..14662450ff9 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ MYSQL_VERSION_MAJOR=10 MYSQL_VERSION_MINOR=1 -MYSQL_VERSION_PATCH=25 +MYSQL_VERSION_PATCH=26 From 41a6475b4954f1ebfce49feff8dc1b4b58b3b916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 3 Jul 2017 16:36:06 +0300 Subject: [PATCH 048/102] InnoDB: Use access() instead of open() --- storage/innobase/os/os0file.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index afe1b5b2079..bb8a35bf2a4 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -3321,15 +3321,8 @@ os_file_get_status_posix( && (stat_info->type == OS_FILE_TYPE_FILE || stat_info->type == OS_FILE_TYPE_BLOCK)) { - int fh = open(path, read_only ? O_RDONLY : O_RDWR, - os_innodb_umask); - - if (fh == -1) { - stat_info->rw_perm = false; - } else { - stat_info->rw_perm = true; - close(fh); - } + stat_info->rw_perm = !access(path, read_only + ? R_OK : R_OK | W_OK); } return(DB_SUCCESS); From 6eb1ce048e63946e79c94c1df65bbebd9a8f7b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 5 Jul 2017 08:07:16 +0300 Subject: [PATCH 049/102] Adjust a test for tmp_disk_table_size The parameter was recently introduced in commit dd8474b1dc556d0ea9491d1908a2d1237818e8c1 but this test was not adjusted accordingly. --- .../sys_vars/r/sysvars_server_embedded.result | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index bf5e267bf44..7cc9fe3c44a 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -4069,6 +4069,34 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME TMP_DISK_TABLE_SIZE +SESSION_VALUE 18446744073709551615 +GLOBAL_VALUE 18446744073709551615 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 18446744073709551615 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table. +NUMERIC_MIN_VALUE 1024 +NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME TMP_MEMORY_TABLE_SIZE +SESSION_VALUE 16777216 +GLOBAL_VALUE 16777216 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 16777216 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. +NUMERIC_MIN_VALUE 1024 +NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TMP_TABLE_SIZE SESSION_VALUE 16777216 GLOBAL_VALUE 16777216 @@ -4076,7 +4104,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16777216 VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table +VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 1 From 15c73c8b4a4eb9f515a4cf5893cac4c776d6befa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 5 Jul 2017 10:08:48 +0300 Subject: [PATCH 050/102] Flush crash-unsafe tables before killing the server --- mysql-test/suite/innodb/r/log_file_name.result | 1 + mysql-test/suite/innodb/t/log_file_name.test | 1 + 2 files changed, 2 insertions(+) diff --git a/mysql-test/suite/innodb/r/log_file_name.result b/mysql-test/suite/innodb/r/log_file_name.result index df4c9f637be..f578455f251 100644 --- a/mysql-test/suite/innodb/r/log_file_name.result +++ b/mysql-test/suite/innodb/r/log_file_name.result @@ -1,4 +1,5 @@ SET GLOBAL innodb_file_per_table=ON; +FLUSH TABLES; CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t3(a INT PRIMARY KEY) ENGINE=InnoDB; BEGIN; diff --git a/mysql-test/suite/innodb/t/log_file_name.test b/mysql-test/suite/innodb/t/log_file_name.test index f2b8dd06fd4..2ee8c49aa7c 100644 --- a/mysql-test/suite/innodb/t/log_file_name.test +++ b/mysql-test/suite/innodb/t/log_file_name.test @@ -7,6 +7,7 @@ --source include/not_embedded.inc SET GLOBAL innodb_file_per_table=ON; +FLUSH TABLES; CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB; From dc722559cc996950a6f13ba62fa675ff2fa9828a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 5 Jul 2017 10:16:36 +0300 Subject: [PATCH 051/102] Correct a message --- mysql-test/suite/innodb/t/log_file_size.test | 2 +- storage/innobase/log/log0recv.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/innodb/t/log_file_size.test b/mysql-test/suite/innodb/t/log_file_size.test index 2a7ca9e0e45..206444115fc 100644 --- a/mysql-test/suite/innodb/t/log_file_size.test +++ b/mysql-test/suite/innodb/t/log_file_size.test @@ -16,7 +16,7 @@ call mtr.add_suppression("Plugin 'InnoDB' init function returned error"); call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed"); call mtr.add_suppression("InnoDB: Plugin initialization aborted"); call mtr.add_suppression("InnoDB: innodb_read_only prevents crash recovery"); -call mtr.add_suppression("InnoDB: Are you sure you are using the right ib_logfiles"); +call mtr.add_suppression("InnoDB: Are you sure you are using the right ib_logfiles"); call mtr.add_suppression("InnoDB: Cannot create log files in read-only mode"); call mtr.add_suppression("InnoDB: Only one log file found"); call mtr.add_suppression("InnoDB: Log file .*ib_logfile[01].* size"); diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 021d897e172..11f3f05acab 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -3231,7 +3231,7 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn) ut_ad(!srv_log_files_created); if (checkpoint_lsn + SIZE_OF_MLOG_CHECKPOINT < flush_lsn) { - ib::warn() << " Are you sure you are using the" + ib::warn() << "Are you sure you are using the" " right ib_logfiles to start up the database?" " Log sequence number in the ib_logfiles is " << checkpoint_lsn << ", less than the" From 8c71c6aa8b9f4c78cfa164fad1d324ba0cf9b888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 30 Jun 2017 10:49:37 +0300 Subject: [PATCH 052/102] MDEV-12548 Initial implementation of Mariabackup for MariaDB 10.2 InnoDB I/O and buffer pool interfaces and the redo log format have been changed between MariaDB 10.1 and 10.2, and the backup code has to be adjusted accordingly. The code has been simplified, and many memory leaks have been fixed. Instead of the file name xtrabackup_logfile, the file name ib_logfile0 is being used for the copy of the redo log. Unnecessary InnoDB startup and shutdown and some unnecessary threads have been removed. Some help was provided by Vladislav Vaintroub. Parameters have been cleaned up and aligned with those of MariaDB 10.2. The --dbug option has been added, so that in debug builds, --dbug=d,ib_log can be specified to enable diagnostic messages for processing redo log entries. By default, innodb_doublewrite=OFF, so that --prepare works faster. If more crash-safety for --prepare is needed, double buffering can be enabled. The parameter innodb_log_checksums=OFF can be used to ignore redo log checksums in --backup. Some messages have been cleaned up. Unless --export is specified, Mariabackup will not deal with undo log. The InnoDB mini-transaction redo log is not only about user-level transactions; it is actually about mini-transactions. To avoid confusion, call it the redo log, not transaction log. We disable any undo log processing in --prepare. Because MariaDB 10.2 supports indexed virtual columns, the undo log processing would need to be able to evaluate virtual column expressions. To reduce the amount of code dependencies, we will not process any undo log in prepare. This means that the --export option must be disabled for now. This also means that the following options are redundant and have been removed: xtrabackup --apply-log-only innobackupex --redo-only In addition to disabling any undo log processing, we will disable any further changes to data pages during --prepare, including the change buffer merge. This means that restoring incremental backups should reliably work even when change buffering is being used on the server. Because of this, preparing a backup will not generate any further redo log, and the redo log file can be safely deleted. (If the --export option is enabled in the future, it must generate redo log when processing undo logs and buffered changes.) In --prepare, we cannot easily know if a partial backup was used, especially when restoring a series of incremental backups. So, we simply warn about any missing files, and ignore the redo log for them. FIXME: Enable the --export option. FIXME: Improve the handling of the MLOG_INDEX_LOAD record, and write a test that initiates a backup while an ALGORITHM=INPLACE operation is creating indexes or rebuilding a table. An error should be detected when preparing the backup. FIXME: In --incremental --prepare, xtrabackup_apply_delta() should ensure that if FSP_SIZE is modified, the file size will be adjusted accordingly. --- extra/mariabackup/CMakeLists.txt | 4 +- extra/mariabackup/backup_copy.cc | 210 +- extra/mariabackup/backup_mysql.cc | 57 +- extra/mariabackup/{wsrep.h => backup_wsrep.h} | 4 +- extra/mariabackup/changed_page_bitmap.cc | 63 +- extra/mariabackup/encryption_plugin.cc | 21 +- extra/mariabackup/fil_cur.cc | 187 +- extra/mariabackup/fil_cur.h | 21 +- extra/mariabackup/innobackupex.cc | 21 +- extra/mariabackup/read_filt.cc | 15 +- extra/mariabackup/read_filt.h | 8 +- extra/mariabackup/write_filt.cc | 20 +- extra/mariabackup/xb0xb.h | 36 - extra/mariabackup/xtrabackup.cc | 2646 ++++++----------- extra/mariabackup/xtrabackup.h | 50 +- .../suite/mariabackup/bug1509812-master.opt | 1 - mysql-test/suite/mariabackup/disabled.def | 2 + mysql-test/suite/mariabackup/full_backup.test | 2 + .../include/restart_and_restore.inc | 10 +- .../suite/mariabackup/incremental_backup.test | 7 +- .../mariabackup/incremental_encrypted.test | 4 +- mysql-test/suite/mariabackup/partial.test | 3 +- .../suite/mariabackup/partial_exclude.test | 3 +- mysql-test/suite/mariabackup/small_ibd.test | 3 +- mysql-test/suite/mariabackup/suite.opt | 2 +- .../mariabackup/xb_aws_key_management.test | 2 + .../mariabackup/xb_compressed_encrypted.test | 9 +- .../mariabackup/xb_file_key_management.result | 4 +- .../mariabackup/xb_file_key_management.test | 17 +- .../mariabackup/xb_fulltext_encrypted.test | 3 +- mysql-test/suite/mariabackup/xb_history.test | 2 + .../suite/mariabackup/xb_page_compress.test | 3 +- .../suite/mariabackup/xb_partition.test | 4 +- mysql-test/suite/mariabackup/xbstream.test | 2 + scripts/wsrep_sst_mariabackup.sh | 2 +- storage/innobase/CMakeLists.txt | 2 + storage/innobase/fil/fil0fil.cc | 11 +- storage/innobase/fsp/fsp0file.cc | 2 + storage/innobase/handler/ha_innodb.cc | 4 +- storage/innobase/include/fil0fil.h | 14 + storage/innobase/include/log0log.h | 9 +- storage/innobase/include/log0log.ic | 1 - storage/innobase/include/log0recv.h | 14 + storage/innobase/include/srv0srv.h | 13 + storage/innobase/include/srv0start.h | 9 + storage/innobase/include/univ.i | 2 +- storage/innobase/log/log0log.cc | 19 +- storage/innobase/log/log0recv.cc | 55 +- storage/innobase/mtr/mtr0mtr.cc | 2 +- storage/innobase/os/os0file.cc | 18 +- storage/innobase/srv/srv0srv.cc | 3 + storage/innobase/srv/srv0start.cc | 114 +- 52 files changed, 1551 insertions(+), 2189 deletions(-) rename extra/mariabackup/{wsrep.h => backup_wsrep.h} (96%) delete mode 100644 mysql-test/suite/mariabackup/bug1509812-master.opt create mode 100644 mysql-test/suite/mariabackup/disabled.def diff --git a/extra/mariabackup/CMakeLists.txt b/extra/mariabackup/CMakeLists.txt index ac15460660c..f7202a7f3b7 100644 --- a/extra/mariabackup/CMakeLists.txt +++ b/extra/mariabackup/CMakeLists.txt @@ -30,7 +30,7 @@ ENDIF() INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/storage/xtradb/include + ${CMAKE_SOURCE_DIR}/storage/innodb/include ${CMAKE_SOURCE_DIR}/sql ${CMAKE_CURRENT_SOURCE_DIR}/quicklz ${CMAKE_CURRENT_SOURCE_DIR} @@ -74,9 +74,9 @@ MYSQL_ADD_EXECUTABLE(mariabackup backup_mysql.cc backup_copy.cc encryption_plugin.cc - ${PROJECT_SOURCE_DIR}/libmysql/libmysql.c ${PROJECT_SOURCE_DIR}/sql/net_serv.cc ${NT_SERVICE_SOURCE} + ${PROJECT_SOURCE_DIR}/libmysqld/libmysql.c COMPONENT backup ) diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index 156e0b20e7c..d9e2db0cb66 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -89,7 +89,7 @@ struct datadir_iter_t { ulint filepath_len; char *filepath_rel; ulint filepath_rel_len; - os_ib_mutex_t mutex; + pthread_mutex_t mutex; os_file_dir_t dir; os_file_dir_t dbdir; os_file_stat_t dbinfo; @@ -107,7 +107,7 @@ struct datadir_thread_ctxt_t { datadir_iter_t *it; uint n_thread; uint *count; - os_ib_mutex_t count_mutex; + pthread_mutex_t count_mutex; os_thread_id_t id; bool ret; }; @@ -134,12 +134,12 @@ datadir_node_fill(datadir_node_t *node, datadir_iter_t *it) { if (node->filepath_len < it->filepath_len) { free(node->filepath); - node->filepath = (char*)(ut_malloc(it->filepath_len)); + node->filepath = (char*)(malloc(it->filepath_len)); node->filepath_len = it->filepath_len; } if (node->filepath_rel_len < it->filepath_rel_len) { free(node->filepath_rel); - node->filepath_rel = (char*)(ut_malloc(it->filepath_rel_len)); + node->filepath_rel = (char*)(malloc(it->filepath_rel_len)); node->filepath_rel_len = it->filepath_rel_len; } @@ -153,8 +153,8 @@ static void datadir_node_free(datadir_node_t *node) { - ut_free(node->filepath); - ut_free(node->filepath_rel); + free(node->filepath); + free(node->filepath_rel); memset(node, 0, sizeof(datadir_node_t)); } @@ -178,10 +178,10 @@ datadir_iter_new(const char *path, bool skip_first_level = true) { datadir_iter_t *it; - it = static_cast(ut_malloc(sizeof(datadir_iter_t))); + it = static_cast(malloc(sizeof(datadir_iter_t))); memset(it, 0, sizeof(datadir_iter_t)); - it->mutex = os_mutex_create(); + pthread_mutex_init(&it->mutex, NULL); it->datadir_path = strdup(path); it->dir = os_file_opendir(it->datadir_path, TRUE); @@ -194,20 +194,20 @@ datadir_iter_new(const char *path, bool skip_first_level = true) it->err = DB_SUCCESS; it->dbpath_len = FN_REFLEN; - it->dbpath = static_cast(ut_malloc(it->dbpath_len)); + it->dbpath = static_cast(malloc(it->dbpath_len)); it->filepath_len = FN_REFLEN; - it->filepath = static_cast(ut_malloc(it->filepath_len)); + it->filepath = static_cast(malloc(it->filepath_len)); it->filepath_rel_len = FN_REFLEN; - it->filepath_rel = static_cast(ut_malloc(it->filepath_rel_len)); + it->filepath_rel = static_cast(malloc(it->filepath_rel_len)); it->skip_first_level = skip_first_level; return(it); error: - ut_free(it); + free(it); return(NULL); } @@ -246,19 +246,15 @@ datadir_iter_next_database(datadir_iter_t *it) + strlen (it->dbinfo.name) + 2; if (len > it->dbpath_len) { it->dbpath_len = len; + free(it->dbpath); - if (it->dbpath) { - - ut_free(it->dbpath); - } - - it->dbpath = static_cast - (ut_malloc(it->dbpath_len)); + it->dbpath = static_cast( + malloc(it->dbpath_len)); } ut_snprintf(it->dbpath, it->dbpath_len, "%s/%s", it->datadir_path, it->dbinfo.name); - srv_normalize_path_for_win(it->dbpath); + os_normalize_path(it->dbpath); if (it->dbinfo.type == OS_FILE_TYPE_FILE) { it->is_file = true; @@ -306,8 +302,8 @@ make_path_n(int n, char **path, ulint *path_len, ...) va_end(vl); if (len_needed < *path_len) { - ut_free(*path); - *path = static_cast(ut_malloc(len_needed)); + free(*path); + *path = static_cast(malloc(len_needed)); } va_start(vl, path_len); @@ -378,7 +374,7 @@ datadir_iter_next(datadir_iter_t *it, datadir_node_t *node) { bool ret = true; - os_mutex_enter(it->mutex); + pthread_mutex_lock(&it->mutex); if (datadir_iter_next_file(it)) { @@ -413,7 +409,7 @@ datadir_iter_next(datadir_iter_t *it, datadir_node_t *node) ret = false; done: - os_mutex_exit(it->mutex); + pthread_mutex_unlock(&it->mutex); return(ret); } @@ -427,7 +423,7 @@ static void datadir_iter_free(datadir_iter_t *it) { - os_mutex_free(it->mutex); + pthread_mutex_destroy(&it->mutex); if (it->dbdir) { @@ -439,11 +435,11 @@ datadir_iter_free(datadir_iter_t *it) os_file_closedir(it->dir); } - ut_free(it->dbpath); - ut_free(it->filepath); - ut_free(it->filepath_rel); + free(it->dbpath); + free(it->filepath); + free(it->filepath_rel); free(it->datadir_path); - ut_free(it); + free(it); } @@ -466,17 +462,17 @@ static void datafile_close(datafile_cur_t *cursor) { - if (cursor->file != 0) { + if (cursor->file != OS_FILE_CLOSED) { os_file_close(cursor->file); } - ut_free(cursor->buf); + free(cursor->buf); } static bool datafile_open(const char *file, datafile_cur_t *cursor, uint thread_n) { - ulint success; + bool success; memset(cursor, 0, sizeof(datafile_cur_t)); @@ -490,11 +486,9 @@ datafile_open(const char *file, datafile_cur_t *cursor, uint thread_n) xb_get_relative_path(cursor->abs_path, FALSE), sizeof(cursor->rel_path)); - cursor->file = os_file_create_simple_no_error_handling(0, - cursor->abs_path, - OS_FILE_OPEN, - OS_FILE_READ_ONLY, - &success, 0); + cursor->file = os_file_create_simple_no_error_handling( + 0, cursor->abs_path, + OS_FILE_OPEN, OS_FILE_READ_ALLOW_DELETE, true, &success); if (!success) { /* The following call prints an error message */ os_file_get_last_error(TRUE); @@ -518,7 +512,7 @@ datafile_open(const char *file, datafile_cur_t *cursor, uint thread_n) posix_fadvise(cursor->file, 0, 0, POSIX_FADV_SEQUENTIAL); cursor->buf_size = 10 * 1024 * 1024; - cursor->buf = static_cast(ut_malloc((ulint)cursor->buf_size)); + cursor->buf = static_cast(malloc((ulint)cursor->buf_size)); return(true); } @@ -528,7 +522,6 @@ static xb_fil_cur_result_t datafile_read(datafile_cur_t *cursor) { - ulint success; ulint to_read; xtrabackup_io_throttling(); @@ -540,14 +533,14 @@ datafile_read(datafile_cur_t *cursor) return(XB_FIL_CUR_EOF); } - success = os_file_read(cursor->file, cursor->buf, cursor->buf_offset, - to_read); - if (!success) { + if (!os_file_read(IORequestRead, + cursor->file, cursor->buf, cursor->buf_offset, + to_read)) { return(XB_FIL_CUR_ERROR); } posix_fadvise(cursor->file, cursor->buf_offset, to_read, - POSIX_FADV_DONTNEED); + POSIX_FADV_DONTNEED); cursor->buf_read = to_read; cursor->buf_offset += to_read; @@ -917,13 +910,13 @@ run_data_threads(datadir_iter_t *it, os_thread_func_t func, uint n) { datadir_thread_ctxt_t *data_threads; uint i, count; - os_ib_mutex_t count_mutex; + pthread_mutex_t count_mutex; bool ret; data_threads = (datadir_thread_ctxt_t*) - (ut_malloc(sizeof(datadir_thread_ctxt_t) * n)); + malloc(sizeof(datadir_thread_ctxt_t) * n); - count_mutex = os_mutex_create(); + pthread_mutex_init(&count_mutex, NULL); count = n; for (i = 0; i < n; i++) { @@ -937,15 +930,15 @@ run_data_threads(datadir_iter_t *it, os_thread_func_t func, uint n) /* Wait for threads to exit */ while (1) { os_thread_sleep(100000); - os_mutex_enter(count_mutex); + pthread_mutex_lock(&count_mutex); if (count == 0) { - os_mutex_exit(count_mutex); + pthread_mutex_unlock(&count_mutex); break; } - os_mutex_exit(count_mutex); + pthread_mutex_unlock(&count_mutex); } - os_mutex_free(count_mutex); + pthread_mutex_destroy(&count_mutex); ret = true; for (i = 0; i < n; i++) { @@ -955,7 +948,7 @@ run_data_threads(datadir_iter_t *it, os_thread_func_t func, uint n) } } - ut_free(data_threads); + free(data_threads); return(ret); } @@ -974,7 +967,6 @@ copy_file(ds_ctxt_t *datasink, ds_file_t *dstfile = NULL; datafile_cur_t cursor; xb_fil_cur_result_t res; - const char *action; if (!datafile_open(src_file_path, &cursor, thread_n)) { goto error_close; @@ -991,9 +983,8 @@ copy_file(ds_ctxt_t *datasink, goto error; } - action = xb_get_copy_action(); msg_ts("[%02u] %s %s to %s\n", - thread_n, action, src_file_path, dstfile->path); + thread_n, xb_get_copy_action(), src_file_path, dstfile->path); /* The main copy loop */ while ((res = datafile_read(&cursor)) == XB_FIL_CUR_SUCCESS) { @@ -1111,7 +1102,7 @@ read_link_file(const char *ibd_filepath, const char *link_filepath) while (lastch > 4 && filepath[lastch] <= 0x20) { filepath[lastch--] = 0x00; } - srv_normalize_path_for_win(filepath); + os_normalize_path(filepath); } tablespace_locations[ibd_filepath] = filepath; @@ -1629,14 +1620,9 @@ apply_log_finish() return(true); } -extern void -os_io_init_simple(void); - bool copy_back() { - char *innobase_data_file_path_copy; - ulint i; bool ret; datadir_iter_t *it = NULL; datadir_node_t node; @@ -1679,24 +1665,16 @@ copy_back() if (!innobase_data_file_path) { innobase_data_file_path = (char*) "ibdata1:10M:autoextend"; } - innobase_data_file_path_copy = strdup(innobase_data_file_path); - if (!(ret = srv_parse_data_file_paths_and_sizes( - innobase_data_file_path_copy))) { + srv_sys_space.set_path("."); + + if (!srv_sys_space.parse_params(innobase_data_file_path, true)) { msg("syntax error in innodb_data_file_path\n"); return(false); } srv_max_n_threads = 1000; - //os_sync_mutex = NULL; - ut_mem_init(); - /* temporally dummy value to avoid crash */ - srv_page_size_shift = 14; - srv_page_size = (1 << srv_page_size_shift); - os_sync_init(); - sync_init(); - os_io_init_simple(); - mem_init(srv_mem_pool_size); + sync_check_init(); ut_crc32_init(); /* copy undo tablespaces */ @@ -1707,9 +1685,9 @@ copy_back() ds_data = ds_create(dst_dir, DS_TYPE_LOCAL); - for (i = 1; i <= srv_undo_tablespaces; i++) { + for (ulong i = 1; i <= srv_undo_tablespaces; i++) { char filename[20]; - sprintf(filename, "undo%03u", (uint)i); + sprintf(filename, "undo%03lu", i); if (!(ret = copy_or_move_file(filename, filename, dst_dir, 1))) { goto cleanup; @@ -1720,29 +1698,30 @@ copy_back() ds_data = NULL; } - /* copy redo logs */ - dst_dir = (srv_log_group_home_dir && *srv_log_group_home_dir) - ? srv_log_group_home_dir : mysql_data_home; + ? srv_log_group_home_dir : mysql_data_home; + + /* --backup generates a single ib_logfile0, which we must copy + if it exists. */ ds_data = ds_create(dst_dir, DS_TYPE_LOCAL); + if (!file_exists("ib_logfile0")) { + /* After completed --prepare, redo log files are redundant. + We must delete any redo logs at the destination, so that + the database will not jump to a different log sequence number + (LSN). */ - for (i = 0; i < (ulong)innobase_log_files_in_group; i++) { - char filename[20]; - sprintf(filename, "ib_logfile%lu", i); - - if (!file_exists(filename)) { - continue; - } - - if (!(ret = copy_or_move_file(filename, filename, - dst_dir, 1))) { - goto cleanup; + for (uint i = 0; i <= SRV_N_LOG_FILES_MAX + 1; i++) { + char filename[FN_REFLEN]; + snprintf(filename, sizeof filename, "%s/ib_logfile%u", + dst_dir, i); + unlink(filename); } + } else if (!(ret = copy_or_move_file("ib_logfile0", "ib_logfile0", + dst_dir, 1))) { + goto cleanup; } - ds_destroy(ds_data); - ds_data = NULL; /* copy innodb system tablespace(s) */ @@ -1751,17 +1730,19 @@ copy_back() ds_data = ds_create(dst_dir, DS_TYPE_LOCAL); - for (i = 0; i < srv_n_data_files; i++) { - const char *filename = base_name(srv_data_file_names[i]); + for (Tablespace::const_iterator iter(srv_sys_space.begin()), + end(srv_sys_space.end()); + iter != end; + ++iter) { + const char *filename = base_name(iter->name()); - if (!(ret = copy_or_move_file(filename, srv_data_file_names[i], + if (!(ret = copy_or_move_file(filename, iter->name(), dst_dir, 1))) { goto cleanup; } } ds_destroy(ds_data); - ds_data = NULL; /* copy the rest of tablespaces */ ds_data = ds_create(mysql_data_home, DS_TYPE_LOCAL); @@ -1771,7 +1752,7 @@ copy_back() datadir_node_init(&node); while (datadir_iter_next(it, &node)) { - const char *ext_list[] = {"backup-my.cnf", "xtrabackup_logfile", + const char *ext_list[] = {"backup-my.cnf", "xtrabackup_binary", "xtrabackup_binlog_info", "xtrabackup_checkpoints", ".qp", ".pmap", ".tmp", NULL}; @@ -1817,21 +1798,18 @@ copy_back() continue; } - /* skip redo logs */ - if (sscanf(filename, "ib_logfile%d%c", &i_tmp, &c_tmp) == 1) { + /* skip the redo log (it was already copied) */ + if (!strcmp(filename, "ib_logfile0")) { continue; } /* skip innodb data files */ is_ibdata_file = false; - for (i = 0; i < srv_n_data_files; i++) { - const char *ibfile; - - ibfile = base_name(srv_data_file_names[i]); - - if (strcmp(ibfile, filename) == 0) { + for (Tablespace::const_iterator iter(srv_sys_space.begin()), + end(srv_sys_space.end()); iter != end; ++iter) { + if (strcmp(iter->name(), filename) == 0) { is_ibdata_file = true; - continue; + break; } } if (is_ibdata_file) { @@ -1873,20 +1851,13 @@ cleanup: datadir_node_free(&node); - free(innobase_data_file_path_copy); - if (ds_data != NULL) { ds_destroy(ds_data); } ds_data = NULL; - //os_sync_free(); - mem_close(); - //os_sync_mutex = NULL; - ut_free_all_mem(); - sync_close(); - sync_initialized = FALSE; + sync_check_close(); return(ret); } @@ -1965,9 +1936,9 @@ cleanup: datadir_node_free(&node); - os_mutex_enter(ctxt->count_mutex); + pthread_mutex_lock(&ctxt->count_mutex); --(*ctxt->count); - os_mutex_exit(ctxt->count_mutex); + pthread_mutex_unlock(&ctxt->count_mutex); ctxt->ret = ret; @@ -1982,10 +1953,7 @@ decrypt_decompress() datadir_iter_t *it = NULL; srv_max_n_threads = 1000; - //os_sync_mutex = NULL; - ut_mem_init(); - os_sync_init(); - sync_init(); + sync_check_init(); /* cd to backup directory */ if (my_setwd(xtrabackup_target_dir, MYF(MY_WME))) @@ -2014,11 +1982,7 @@ decrypt_decompress() ds_data = NULL; - sync_close(); - sync_initialized = FALSE; - //os_sync_free(); - //os_sync_mutex = NULL; - ut_free_all_mem(); + sync_check_close(); return(ret); } diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 2353c7692cb..c6ec54c3a6c 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -54,6 +54,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include "mysqld.h" #include "encryption_plugin.h" #include +#include char *tool_name; @@ -494,7 +495,7 @@ get_mysql_vars(MYSQL *connection) && innodb_log_files_in_group_var) { char *endptr; - innobase_log_files_in_group = strtol( + srv_n_log_files = strtol( innodb_log_files_in_group_var, &endptr, 10); ut_ad(*endptr == 0); } @@ -503,7 +504,7 @@ get_mysql_vars(MYSQL *connection) && innodb_log_file_size_var) { char *endptr; - innobase_log_file_size = strtoll( + srv_log_file_size = strtoll( innodb_log_file_size_var, &endptr, 10); ut_ad(*endptr == 0); } @@ -850,9 +851,9 @@ static void start_query_killer() { - kill_query_thread_stop = os_event_create(); - kill_query_thread_started = os_event_create(); - kill_query_thread_stopped = os_event_create(); + kill_query_thread_stop = os_event_create(0); + kill_query_thread_started = os_event_create(0); + kill_query_thread_stopped = os_event_create(0); os_thread_create(kill_query_thread, NULL, &kill_query_thread_id); @@ -1368,17 +1369,27 @@ cleanup: return(result); } -static string escape_and_quote(MYSQL *mysql,const char *str) +struct escape_and_quote { - if (!str) - return "NULL"; - size_t len = strlen(str); - char* escaped = (char *)alloca(2 * len + 3); - escaped[0] = '\''; - size_t new_len = mysql_real_escape_string(mysql, escaped+1, str, len); - escaped[new_len + 1] = '\''; - escaped[new_len + 2] = 0; - return string(escaped); + escape_and_quote(MYSQL *mysql, const char *str) + : mysql(mysql), str(str) {} + MYSQL * const mysql; + const char * const str; +}; + +static +std::ostream& +operator<<(std::ostream& s, const escape_and_quote& eq) +{ + if (!eq.str) + return s << "NULL"; + s << '\''; + size_t len = strlen(eq.str); + char* escaped = (char *)alloca(2 * len + 1); + len = mysql_real_escape_string(eq.mysql, escaped, eq.str, len); + s << std::string(escaped, len); + s << '\''; + return s; } /*********************************************************************//** @@ -1395,12 +1406,9 @@ write_xtrabackup_info(MYSQL *connection) char buf_start_time[100]; char buf_end_time[100]; tm tm; - ostringstream oss; + std::ostringstream oss; const char *xb_stream_name[] = {"file", "tar", "xbstream"}; - - ut_ad(xtrabackup_stream_fmt < 3); - uuid = read_mysql_one_value(connection, "SELECT UUID()"); server_version = read_mysql_one_value(connection, "SELECT VERSION()"); localtime_r(&history_start_time, &tm); @@ -1528,28 +1536,21 @@ bool write_backup_config_file() "# The MySQL server\n" "[mysqld]\n" "innodb_checksum_algorithm=%s\n" - "innodb_log_checksum_algorithm=%s\n" "innodb_data_file_path=%s\n" "innodb_log_files_in_group=%lu\n" - "innodb_log_file_size=%lld\n" + "innodb_log_file_size=%llu\n" "innodb_page_size=%lu\n" - "innodb_log_block_size=%lu\n" "innodb_undo_directory=%s\n" "innodb_undo_tablespaces=%lu\n" "%s%s\n" - "%s%s\n" "%s\n", innodb_checksum_algorithm_names[srv_checksum_algorithm], - innodb_checksum_algorithm_names[srv_log_checksum_algorithm], innobase_data_file_path, srv_n_log_files, - innobase_log_file_size, + srv_log_file_size, srv_page_size, - srv_log_block_size, srv_undo_dir, srv_undo_tablespaces, - innobase_doublewrite_file ? "innodb_doublewrite_file=" : "", - innobase_doublewrite_file ? innobase_doublewrite_file : "", innobase_buffer_pool_filename ? "innodb_buffer_pool_filename=" : "", innobase_buffer_pool_filename ? diff --git a/extra/mariabackup/wsrep.h b/extra/mariabackup/backup_wsrep.h similarity index 96% rename from extra/mariabackup/wsrep.h rename to extra/mariabackup/backup_wsrep.h index 7638d1f2b54..6537b304e12 100644 --- a/extra/mariabackup/wsrep.h +++ b/extra/mariabackup/backup_wsrep.h @@ -19,8 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *******************************************************/ -#ifndef WSREP_H -#define WSREP_H +#ifndef BACKUP_WSREP_H +#define BACKUP_WSREP_H /*********************************************************************** Store Galera checkpoint info in the 'xtrabackup_galera_info' file, if that diff --git a/extra/mariabackup/changed_page_bitmap.cc b/extra/mariabackup/changed_page_bitmap.cc index 86a873ef69c..ce769375a16 100644 --- a/extra/mariabackup/changed_page_bitmap.cc +++ b/extra/mariabackup/changed_page_bitmap.cc @@ -193,9 +193,9 @@ log_online_read_bitmap_page( ut_a(bitmap_file->offset <= bitmap_file->size - MODIFIED_PAGE_BLOCK_SIZE); ut_a(bitmap_file->offset % MODIFIED_PAGE_BLOCK_SIZE == 0); - - success = os_file_read(bitmap_file->file, page, bitmap_file->offset, - MODIFIED_PAGE_BLOCK_SIZE); + success = os_file_read(IORequestRead, + bitmap_file->file, page, bitmap_file->offset, + MODIFIED_PAGE_BLOCK_SIZE); if (UNIV_UNLIKELY(!success)) { @@ -355,8 +355,7 @@ log_online_setup_bitmap_file_range( bitmap_files->files = static_cast - (ut_malloc(bitmap_files->count - * sizeof(bitmap_files->files[0]))); + (malloc(bitmap_files->count * sizeof(bitmap_files->files[0]))); memset(bitmap_files->files, 0, bitmap_files->count * sizeof(bitmap_files->files[0])); @@ -426,9 +425,9 @@ log_online_setup_bitmap_file_range( /****************************************************************//** Open a bitmap file for reading. -@return TRUE if opened successfully */ +@return whether opened successfully */ static -ibool +bool log_online_open_bitmap_file_read_only( /*==================================*/ const char* name, /*!name, FN_REFLEN, "%s%s", srv_data_home, name); - bitmap_file->file - = os_file_create_simple_no_error_handling(0, bitmap_file->name, - OS_FILE_OPEN, - OS_FILE_READ_ONLY, - &success,0); + bitmap_file->file = os_file_create_simple_no_error_handling( + 0, bitmap_file->name, + OS_FILE_OPEN, OS_FILE_READ_ONLY, true, &success); if (UNIV_UNLIKELY(!success)) { /* Here and below assume that bitmap file names do not contain apostrophes, thus no need for ut_print_filename(). */ msg("InnoDB: Warning: error opening the changed page " "bitmap \'%s\'\n", bitmap_file->name); - return FALSE; + return success; } bitmap_file->size = os_file_get_size(bitmap_file->file); @@ -465,7 +462,7 @@ log_online_open_bitmap_file_read_only( posix_fadvise(bitmap_file->file, 0, 0, POSIX_FADV_NOREUSE); #endif - return TRUE; + return success; } /****************************************************************//** @@ -909,6 +906,37 @@ xb_page_bitmap_setup_next_page( return TRUE; } +/** Find the node with the smallest key that greater than equal to search key. +@param[in] tree red-black tree +@param[in] key search key +@return node with the smallest greater-than-or-equal key +@retval NULL if none was found */ +static +const ib_rbt_node_t* +rbt_lower_bound(const ib_rbt_t* tree, const void* key) +{ + ut_ad(!tree->cmp_arg); + const ib_rbt_node_t* ge = NULL; + + for (const ib_rbt_node_t *node = tree->root->left; + node != tree->nil; ) { + int result = tree->compare(node->value, key); + + if (result < 0) { + node = node->right; + } else { + ge = node; + if (result == 0) { + break; + } + + node = node->left; + } + } + + return(ge); +} + /****************************************************************//** Set up a new bitmap range iterator over a given space id changed pages in a given bitmap. @@ -922,8 +950,7 @@ xb_page_bitmap_range_init( { byte search_page[MODIFIED_PAGE_BLOCK_SIZE]; xb_page_bitmap_range *result - = static_cast - (ut_malloc(sizeof(*result))); + = static_cast(malloc(sizeof(*result))); memset(result, 0, sizeof(*result)); result->bitmap = bitmap; @@ -1014,5 +1041,5 @@ xb_page_bitmap_range_deinit( /*========================*/ xb_page_bitmap_range* bitmap_range) /*! in/out: bitmap range */ { - ut_free(bitmap_range); + free(bitmap_range); } diff --git a/extra/mariabackup/encryption_plugin.cc b/extra/mariabackup/encryption_plugin.cc index 8f7741b057a..76512c185e2 100644 --- a/extra/mariabackup/encryption_plugin.cc +++ b/extra/mariabackup/encryption_plugin.cc @@ -8,6 +8,7 @@ #include #include #include +#include extern struct st_maria_plugin *mysql_optional_plugins[]; @@ -18,14 +19,14 @@ extern char *xb_plugin_load; extern char *xb_plugin_dir; const int PLUGIN_MAX_ARGS = 1024; -vector backup_plugins_args; +std::vector backup_plugins_args; const char *QUERY_PLUGIN = "SELECT plugin_name, plugin_library, @@plugin_dir" " FROM information_schema.plugins WHERE plugin_type='ENCRYPTION'" " AND plugin_status='ACTIVE'"; -string encryption_plugin_config; +std::string encryption_plugin_config; static void add_to_plugin_load_list(const char *plugin_def) { @@ -38,7 +39,7 @@ void encryption_plugin_backup_init(MYSQL *mysql) { MYSQL_RES *result; MYSQL_ROW row; - ostringstream oss; + std::ostringstream oss; char *argv[PLUGIN_MAX_ARGS]; int argc; @@ -59,17 +60,17 @@ void encryption_plugin_backup_init(MYSQL *mysql) if (*p == '\\') *p = '/'; #endif - string plugin_load(name); + std::string plugin_load(name); if (library) - plugin_load += string("=") + library; + plugin_load += std::string("=") + library; - oss << "plugin_load=" << plugin_load << endl; + oss << "plugin_load=" << plugin_load << std::endl; /* Required to load the plugin later.*/ add_to_plugin_load_list(plugin_load.c_str()); strncpy(opt_plugin_dir, dir, FN_REFLEN); - oss << "plugin_dir=" << '"' << dir << '"' << endl; + oss << "plugin_dir=" << '"' << dir << '"' << std::endl; /* Read plugin variables. */ @@ -80,12 +81,12 @@ void encryption_plugin_backup_init(MYSQL *mysql) result = xb_mysql_query(mysql, query, true, true); while ((row = mysql_fetch_row(result))) { - string arg("--"); + std::string arg("--"); arg += row[0]; arg += "="; arg += row[1]; backup_plugins_args.push_back(arg); - oss << row[0] << "=" << row[1] << endl; + oss << row[0] << "=" << row[1] << std::endl; } mysql_free_result(result); @@ -94,7 +95,7 @@ void encryption_plugin_backup_init(MYSQL *mysql) result = xb_mysql_query(mysql, "select @@innodb_encrypt_log", true, true); row = mysql_fetch_row(result); srv_encrypt_log = (row != 0 && row[0][0] == '1'); - oss << "innodb_encrypt_log=" << row[0] << endl; + oss << "innodb_encrypt_log=" << row[0] << std::endl; mysql_free_result(result); diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc index 820d8e10c29..9df5f8e8fa3 100644 --- a/extra/mariabackup/fil_cur.cc +++ b/extra/mariabackup/fil_cur.cc @@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #include -#include #include +#include #include #include @@ -63,7 +63,7 @@ xb_get_relative_path( prev = NULL; cur = path; - while ((next = strchr(cur, SRV_PATH_SEPARATOR)) != NULL) { + while ((next = strchr(cur, OS_PATH_SEPARATOR)) != NULL) { prev = cur; cur = next + 1; @@ -96,7 +96,7 @@ xb_fil_node_close_file( ut_a(node->n_pending_flushes == 0); ut_a(!node->being_extended); - if (!node->open) { + if (!node->is_open()) { mutex_exit(&fil_system->mutex); @@ -106,19 +106,19 @@ xb_fil_node_close_file( ret = os_file_close(node->handle); ut_a(ret); - node->open = FALSE; + node->handle = OS_FILE_CLOSED; ut_a(fil_system->n_open > 0); fil_system->n_open--; fil_n_file_opened--; - if (node->space->purpose == FIL_TABLESPACE && + if (node->space->purpose == FIL_TYPE_TABLESPACE && fil_is_user_tablespace_id(node->space->id)) { ut_a(UT_LIST_GET_LEN(fil_system->LRU) > 0); /* The node is in the LRU list, remove it */ - UT_LIST_REMOVE(LRU, fil_system->LRU, node); + UT_LIST_REMOVE(fil_system->LRU, node); } mutex_exit(&fil_system->mutex); @@ -137,10 +137,7 @@ xb_fil_cur_open( fil_node_t* node, /*!< in: source tablespace node */ uint thread_n) /*!< thread number for diagnostics */ { - ulint page_size; - ulint page_size_shift; - ulint zip_size; - ibool success; + bool success; /* Initialize these first so xb_fil_cur_close() handles them correctly in case of error */ @@ -148,27 +145,26 @@ xb_fil_cur_open( cursor->node = NULL; cursor->space_id = node->space->id; - cursor->is_system = !fil_is_user_tablespace_id(node->space->id); strncpy(cursor->abs_path, node->name, sizeof(cursor->abs_path)); /* Get the relative path for the destination tablespace name, i.e. the one that can be appended to the backup root directory. Non-system - tablespaces may have absolute paths for remote tablespaces in MySQL - 5.6+. We want to make "local" copies for the backup. */ + tablespaces may have absolute paths for DATA DIRECTORY. + We want to make "local" copies for the backup. */ strncpy(cursor->rel_path, - xb_get_relative_path(cursor->abs_path, cursor->is_system), + xb_get_relative_path(cursor->abs_path, cursor->is_system()), sizeof(cursor->rel_path)); /* In the backup mode we should already have a tablespace handle created - by fil_load_single_table_tablespace() unless it is a system + by fil_ibd_load() unless it is a system tablespace. Otherwise we open the file here. */ - if (cursor->is_system || !srv_backup_mode || srv_close_files) { - node->handle = - os_file_create_simple_no_error_handling(0, node->name, - OS_FILE_OPEN, - OS_FILE_READ_ONLY, - &success,0); + if (cursor->is_system() || srv_operation == SRV_OPERATION_RESTORE + || xb_close_files) { + node->handle = os_file_create_simple_no_error_handling( + 0, node->name, + OS_FILE_OPEN, + OS_FILE_READ_ALLOW_DELETE, true, &success); if (!success) { /* The following call prints an error message */ os_file_get_last_error(TRUE); @@ -181,22 +177,20 @@ xb_fil_cur_open( } mutex_enter(&fil_system->mutex); - node->open = TRUE; - fil_system->n_open++; fil_n_file_opened++; - if (node->space->purpose == FIL_TABLESPACE && + if (node->space->purpose == FIL_TYPE_TABLESPACE && fil_is_user_tablespace_id(node->space->id)) { /* Put the node to the LRU list */ - UT_LIST_ADD_FIRST(LRU, fil_system->LRU, node); + UT_LIST_ADD_FIRST(fil_system->LRU, node); } mutex_exit(&fil_system->mutex); } - ut_ad(node->open); + ut_ad(node->is_open()); cursor->node = node; cursor->file = node->handle; @@ -210,8 +204,8 @@ xb_fil_cur_open( return(XB_FIL_CUR_ERROR); } - if (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT - || srv_unix_file_flush_method == SRV_UNIX_O_DIRECT_NO_FSYNC) { + if (srv_file_flush_method == SRV_O_DIRECT + || srv_file_flush_method == SRV_O_DIRECT_NO_FSYNC) { os_file_set_nocache(cursor->file, node->name, "OPEN"); } @@ -219,32 +213,29 @@ xb_fil_cur_open( posix_fadvise(cursor->file, 0, 0, POSIX_FADV_SEQUENTIAL); /* Determine the page size */ - zip_size = xb_get_zip_size(cursor->file); - if (zip_size == ULINT_UNDEFINED) { + ulint flags = xb_get_space_flags(cursor->file); + if (flags == ULINT_UNDEFINED) { xb_fil_cur_close(cursor); return(XB_FIL_CUR_SKIP); - } else if (zip_size) { - page_size = zip_size; - page_size_shift = get_bit_shift(page_size); - msg("[%02u] %s is compressed with page size = " - "%lu bytes\n", thread_n, node->name, page_size); - if (page_size_shift < 10 || page_size_shift > 14) { - msg("[%02u] xtrabackup: Error: Invalid " - "page size: %lu.\n", thread_n, page_size); - ut_error; - } - } else { - page_size = UNIV_PAGE_SIZE; - page_size_shift = UNIV_PAGE_SIZE_SHIFT; } + + if (!fsp_flags_is_valid(flags)) { + ulint cflags = fsp_flags_convert_from_101(flags); + if (cflags == ULINT_UNDEFINED) { + msg("[%02u] xtrabackup: Error: Invalid " + "tablespace flags: %x.\n", thread_n, uint(flags)); + return(XB_FIL_CUR_SKIP); + } + flags = cflags; + } + + const page_size_t page_size(flags); cursor->page_size = page_size; - cursor->page_size_shift = page_size_shift; - cursor->zip_size = zip_size; /* Allocate read buffer */ - cursor->buf_size = XB_FIL_CUR_PAGES * page_size; + cursor->buf_size = XB_FIL_CUR_PAGES * page_size.physical(); cursor->orig_buf = static_cast - (ut_malloc(cursor->buf_size + UNIV_PAGE_SIZE)); + (malloc(cursor->buf_size + UNIV_PAGE_SIZE)); cursor->buf = static_cast (ut_align(cursor->orig_buf, UNIV_PAGE_SIZE)); @@ -254,7 +245,8 @@ xb_fil_cur_open( cursor->buf_page_no = 0; cursor->thread_n = thread_n; - cursor->space_size = (ulint)(cursor->statinfo.st_size / page_size); + cursor->space_size = (ulint)(cursor->statinfo.st_size + / page_size.physical()); cursor->read_filter = read_filter; cursor->read_filter->init(&cursor->read_filter_ctxt, cursor, @@ -282,6 +274,8 @@ xb_fil_cur_read( xb_fil_cur_result_t ret; ib_int64_t offset; ib_int64_t to_read; + const ulint page_size = cursor->page_size.physical(); + xb_ad(!cursor->is_system() || page_size == UNIV_PAGE_SIZE); cursor->read_filter->get_next_batch(&cursor->read_filter_ctxt, &offset, &to_read); @@ -296,10 +290,10 @@ xb_fil_cur_read( xb_a(to_read > 0 && to_read <= 0xFFFFFFFFLL); - if (to_read % cursor->page_size != 0 && - offset + to_read == cursor->statinfo.st_size) { + if ((to_read & ~(page_size - 1)) + && offset + to_read == cursor->statinfo.st_size) { - if (to_read < (ib_int64_t) cursor->page_size) { + if (to_read < (ib_int64_t) page_size) { msg("[%02u] xtrabackup: Warning: junk at the end of " "%s:\n", cursor->thread_n, cursor->abs_path); msg("[%02u] xtrabackup: Warning: offset = %llu, " @@ -312,12 +306,12 @@ xb_fil_cur_read( } to_read = (ib_int64_t) (((ulint) to_read) & - ~(cursor->page_size - 1)); + ~(page_size - 1)); } - xb_a(to_read % cursor->page_size == 0); + xb_a((to_read & (page_size - 1)) == 0); - npages = (ulint) (to_read >> cursor->page_size_shift); + npages = (ulint) (to_read / cursor->page_size.physical()); retry_count = 10; ret = XB_FIL_CUR_SUCCESS; @@ -328,59 +322,59 @@ read_retry: cursor->buf_read = 0; cursor->buf_npages = 0; cursor->buf_offset = offset; - cursor->buf_page_no = (ulint)(offset >> cursor->page_size_shift); + cursor->buf_page_no = (ulint)(offset / cursor->page_size.physical()); - success = os_file_read(cursor->file, cursor->buf, offset, - (ulint)to_read); + FilSpace space(cursor->space_id); + + if (!space()) { + return(XB_FIL_CUR_ERROR); + } + + success = os_file_read(IORequestRead, + cursor->file, cursor->buf, offset, + (ulint) to_read); if (!success) { return(XB_FIL_CUR_ERROR); } - fil_system_enter(); - fil_space_t *space = fil_space_get_by_id(cursor->space_id); - fil_system_exit(); - /* check pages for corruption and re-read if necessary. i.e. in case of partially written pages */ for (page = cursor->buf, i = 0; i < npages; - page += cursor->page_size, i++) { - ib_int64_t page_no = cursor->buf_page_no + i; + page += page_size, i++) { + ulint page_no = cursor->buf_page_no + i; - bool checksum_ok = fil_space_verify_crypt_checksum(page, cursor->zip_size,space, (ulint)page_no); - - if (!checksum_ok && - buf_page_is_corrupted(true, page, cursor->zip_size,space)) { - - if (cursor->is_system && - page_no >= (ib_int64_t)FSP_EXTENT_SIZE && - page_no < (ib_int64_t) FSP_EXTENT_SIZE * 3) { - /* skip doublewrite buffer pages */ - xb_a(cursor->page_size == UNIV_PAGE_SIZE); + if (cursor->space_id == TRX_SYS_SPACE && + page_no >= FSP_EXTENT_SIZE && + page_no < FSP_EXTENT_SIZE * 3) { + /* We ignore the doublewrite buffer pages */ + } else if (!fil_space_verify_crypt_checksum( + page, cursor->page_size, space->id, page_no) + && buf_page_is_corrupted(true, page, + cursor->page_size, + space)) { + retry_count--; + if (retry_count == 0) { msg("[%02u] xtrabackup: " - "Page %lu is a doublewrite buffer page, " - "skipping.\n", cursor->thread_n, page_no); - } else { - retry_count--; - if (retry_count == 0) { - msg("[%02u] xtrabackup: " - "Error: failed to read page after " - "10 retries. File %s seems to be " - "corrupted.\n", cursor->thread_n, - cursor->abs_path); - ret = XB_FIL_CUR_ERROR; - break; - } + "Error: failed to read page after " + "10 retries. File %s seems to be " + "corrupted.\n", cursor->thread_n, + cursor->abs_path); + ret = XB_FIL_CUR_ERROR; + break; + } + + if (retry_count == 9) { msg("[%02u] xtrabackup: " "Database page corruption detected at page " - "%lu, retrying...\n", cursor->thread_n, - page_no); - - os_thread_sleep(100000); - - goto read_retry; + ULINTPF ", retrying...\n", + cursor->thread_n, page_no); } + + os_thread_sleep(100000); + + goto read_retry; } - cursor->buf_read += cursor->page_size; + cursor->buf_read += page_size; cursor->buf_npages++; } @@ -399,11 +393,10 @@ xb_fil_cur_close( { cursor->read_filter->deinit(&cursor->read_filter_ctxt); - if (cursor->orig_buf != NULL) { - ut_free(cursor->orig_buf); - } + free(cursor->orig_buf); + if (cursor->node != NULL) { xb_fil_node_close_file(cursor->node); - cursor->file = XB_FILE_UNDEFINED; + cursor->file = OS_FILE_CLOSED; } } diff --git a/extra/mariabackup/fil_cur.h b/extra/mariabackup/fil_cur.h index f3601823a5a..e3f356a346c 100644 --- a/extra/mariabackup/fil_cur.h +++ b/extra/mariabackup/fil_cur.h @@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #include #include "read_filt.h" +#include "srv0start.h" struct xb_fil_cur_t { pfs_os_file_t file; /*!< source file handle */ @@ -36,14 +37,7 @@ struct xb_fil_cur_t { char abs_path[FN_REFLEN]; /*!< absolute file path */ MY_STAT statinfo; /*!< information about the file */ - ulint zip_size; /*!< compressed page size in bytes or 0 - for uncompressed pages */ - ulint page_size; /*!< = zip_size for compressed pages or - UNIV_PAGE_SIZE for uncompressed ones */ - ulint page_size_shift;/*!< bit shift corresponding to - page_size */ - my_bool is_system; /*!< TRUE for system tablespace, FALSE - otherwise */ + page_size_t page_size; /*!< page size */ xb_read_filt_t* read_filter; /*!< read filter */ xb_read_filt_ctxt_t read_filter_ctxt; /*!< read filter context */ @@ -61,6 +55,17 @@ struct xb_fil_cur_t { uint thread_n; /*!< thread number for diagnostics */ ulint space_id; /*!< ID of tablespace */ ulint space_size; /*!< space size in pages */ + + /** TODO: remove this default constructor */ + xb_fil_cur_t() : page_size(0), read_filter_ctxt() {} + + /** @return whether this is not a file-per-table tablespace */ + bool is_system() const + { + ut_ad(space_id != SRV_TMP_SPACE_ID); + return(space_id == TRX_SYS_SPACE + || srv_is_undo_tablespace(space_id)); + } }; typedef enum { diff --git a/extra/mariabackup/innobackupex.cc b/extra/mariabackup/innobackupex.cc index 7e97b258489..4fb85208eff 100644 --- a/extra/mariabackup/innobackupex.cc +++ b/extra/mariabackup/innobackupex.cc @@ -45,7 +45,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include #include #include -#include #include #include #include @@ -70,7 +69,6 @@ using std::max; my_bool opt_ibx_version = FALSE; my_bool opt_ibx_help = FALSE; my_bool opt_ibx_apply_log = FALSE; -my_bool opt_ibx_redo_only = FALSE; my_bool opt_ibx_incremental = FALSE; my_bool opt_ibx_notimestamp = FALSE; @@ -226,21 +224,11 @@ static struct my_option ibx_long_options[] = GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"apply-log", OPT_APPLY_LOG, "Prepare a backup in BACKUP-DIR by " - "applying the transaction log file named \"xtrabackup_logfile\" " - "located in the same directory. Also, create new transaction logs. " + "applying the redo log 'ib_logfile0' and creating new redo log. " "The InnoDB configuration is read from the file \"backup-my.cnf\".", (uchar*) &opt_ibx_apply_log, (uchar*) &opt_ibx_apply_log, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"redo-only", OPT_REDO_ONLY, "This option should be used when " - "preparing the base full backup and when merging all incrementals " - "except the last one. This forces xtrabackup to skip the \"rollback\" " - "phase and do a \"redo\" only. This is necessary if the backup will " - "have incremental changes applied to it later. See the xtrabackup " - "documentation for details.", - (uchar *) &opt_ibx_redo_only, (uchar *) &opt_ibx_redo_only, 0, - GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"copy-back", OPT_COPY_BACK, "Copy all the files in a previously made " "backup from the backup directory to their original locations.", (uchar *) &opt_ibx_copy_back, (uchar *) &opt_ibx_copy_back, 0, @@ -682,7 +670,7 @@ innobackupex [--compress] [--compress-threads=NUMBER-OF-THREADS] [--compress-chu \n\ innobackupex --apply-log [--use-memory=B]\n\ [--defaults-file=MY.CNF]\n\ - [--export] [--redo-only] [--ibbackup=IBBACKUP-BINARY]\n\ + [--export] [--ibbackup=IBBACKUP-BINARY]\n\ BACKUP-DIR\n\ \n\ innobackupex --copy-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR\n\ @@ -710,7 +698,7 @@ process.\n\ \n\ The --apply-log command prepares a backup for starting a MySQL\n\ server on the backup. This command recovers InnoDB data files as specified\n\ -in BACKUP-DIR/backup-my.cnf using BACKUP-DIR/xtrabackup_logfile,\n\ +in BACKUP-DIR/backup-my.cnf using BACKUP-DIR/ib_logfile0,\n\ and creates new InnoDB log files as specified in BACKUP-DIR/backup-my.cnf.\n\ The BACKUP-DIR should be the path to a backup directory created by\n\ xtrabackup. This command runs xtrabackup as a child process, but it does not \n\ @@ -980,9 +968,6 @@ ibx_init() switch (ibx_mode) { case IBX_MODE_APPLY_LOG: xtrabackup_prepare = TRUE; - if (opt_ibx_redo_only) { - xtrabackup_apply_log_only = TRUE; - } xtrabackup_target_dir = ibx_position_arg; run = "apply-log"; break; diff --git a/extra/mariabackup/read_filt.cc b/extra/mariabackup/read_filt.cc index 05e6b7c86c7..a48591abf29 100644 --- a/extra/mariabackup/read_filt.cc +++ b/extra/mariabackup/read_filt.cc @@ -127,10 +127,11 @@ rf_bitmap_get_next_batch( of pages */ { ulint start_page_id; + const ulint page_size = ctxt->page_size.physical(); - start_page_id = (ulint)(ctxt->offset / ctxt->page_size); + start_page_id = (ulint)(ctxt->offset / page_size); - xb_a (ctxt->offset % ctxt->page_size == 0); + xb_a (ctxt->offset % page_size == 0); if (start_page_id == ctxt->filter_batch_end) { @@ -146,7 +147,7 @@ rf_bitmap_get_next_batch( return; } - ctxt->offset = next_page_id * ctxt->page_size; + ctxt->offset = next_page_id * page_size; /* Find the end of the current changed page block by searching for the next cleared bitmap bit */ @@ -162,7 +163,7 @@ rf_bitmap_get_next_batch( remaining pages. */ *read_batch_len = ctxt->data_file_size - ctxt->offset; } else { - *read_batch_len = ctxt->filter_batch_end * ctxt->page_size + *read_batch_len = ctxt->filter_batch_end * page_size - ctxt->offset; } @@ -175,9 +176,9 @@ rf_bitmap_get_next_batch( } ctxt->offset += *read_batch_len; - xb_a (ctxt->offset % ctxt->page_size == 0); - xb_a (*read_batch_start % ctxt->page_size == 0); - xb_a (*read_batch_len % ctxt->page_size == 0); + xb_a (ctxt->offset % page_size == 0); + xb_a (*read_batch_start % page_size == 0); + xb_a (*read_batch_len % page_size == 0); } /****************************************************************//** diff --git a/extra/mariabackup/read_filt.h b/extra/mariabackup/read_filt.h index d16f4e1093d..cebc714eed8 100644 --- a/extra/mariabackup/read_filt.h +++ b/extra/mariabackup/read_filt.h @@ -27,6 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #include "changed_page_bitmap.h" +typedef ulint space_id_t; + struct xb_fil_cur_t; /* The read filter context */ @@ -34,15 +36,17 @@ struct xb_read_filt_ctxt_t { ib_int64_t offset; /*!< current file offset */ ib_int64_t data_file_size; /*!< data file size */ size_t buffer_capacity;/*!< read buffer capacity */ - ib_int64_t space_id; /*!< space id */ + space_id_t space_id; /*!< space id */ /* The following fields used only in bitmap filter */ /* Move these to union if any other filters are added in future */ xb_page_bitmap_range *bitmap_range; /*!< changed page bitmap range iterator for space_id */ - size_t page_size; /*!< page size */ + page_size_t page_size; /*!< page size */ ulint filter_batch_end;/*!< the ending page id of the current changed page block in the bitmap */ + /** TODO: remove this default constructor */ + xb_read_filt_ctxt_t() : page_size(0) {} }; /* The read filter */ diff --git a/extra/mariabackup/write_filt.cc b/extra/mariabackup/write_filt.cc index cf7753bf380..a0633818405 100644 --- a/extra/mariabackup/write_filt.cc +++ b/extra/mariabackup/write_filt.cc @@ -67,7 +67,6 @@ wf_incremental_init(xb_write_filt_ctxt_t *ctxt, char *dst_name, xb_fil_cur_t *cursor) { char meta_name[FN_REFLEN]; - xb_delta_info_t info; ulint buf_size; xb_wf_incremental_ctxt_t *cp = &(ctxt->u.wf_incremental_ctxt); @@ -75,8 +74,9 @@ wf_incremental_init(xb_write_filt_ctxt_t *ctxt, char *dst_name, ctxt->cursor = cursor; /* allocate buffer for incremental backup (4096 pages) */ - buf_size = (cursor->page_size / 4 + 1) * cursor->page_size; - cp->delta_buf_base = static_cast(ut_malloc(buf_size)); + buf_size = (cursor->page_size.physical() / 4 + 1) + * cursor->page_size.physical(); + cp->delta_buf_base = static_cast(malloc(buf_size)); memset(cp->delta_buf_base, 0, buf_size); cp->delta_buf = static_cast (ut_align(cp->delta_buf_base, UNIV_PAGE_SIZE_MAX)); @@ -84,9 +84,7 @@ wf_incremental_init(xb_write_filt_ctxt_t *ctxt, char *dst_name, /* write delta meta info */ snprintf(meta_name, sizeof(meta_name), "%s%s", dst_name, XB_DELTA_INFO_SUFFIX); - info.page_size = cursor->page_size; - info.zip_size = cursor->zip_size; - info.space_id = cursor->space_id; + const xb_delta_info_t info(cursor->page_size, cursor->space_id); if (!xb_write_delta_metadata(meta_name, &info)) { msg("[%02u] xtrabackup: Error: " "failed to write meta info for %s\n", @@ -113,8 +111,9 @@ wf_incremental_process(xb_write_filt_ctxt_t *ctxt, ds_file_t *dstfile) { ulint i; xb_fil_cur_t *cursor = ctxt->cursor; - ulint page_size = cursor->page_size; byte *page; + const ulint page_size + = cursor->page_size.physical(); xb_wf_incremental_ctxt_t *cp = &(ctxt->u.wf_incremental_ctxt); for (i = 0, page = cursor->buf; i < cursor->buf_npages; @@ -159,7 +158,8 @@ static my_bool wf_incremental_finalize(xb_write_filt_ctxt_t *ctxt, ds_file_t *dstfile) { xb_fil_cur_t *cursor = ctxt->cursor; - ulint page_size = cursor->page_size; + const ulint page_size + = cursor->page_size.physical(); xb_wf_incremental_ctxt_t *cp = &(ctxt->u.wf_incremental_ctxt); if (cp->npages != page_size / 4) { @@ -184,9 +184,7 @@ wf_incremental_deinit(xb_write_filt_ctxt_t *ctxt) { xb_wf_incremental_ctxt_t *cp = &(ctxt->u.wf_incremental_ctxt); - if (cp->delta_buf_base != NULL) { - ut_free(cp->delta_buf_base); - } + free(cp->delta_buf_base); } /************************************************************************ diff --git a/extra/mariabackup/xb0xb.h b/extra/mariabackup/xb0xb.h index a8b17f59579..59938a014c6 100644 --- a/extra/mariabackup/xb0xb.h +++ b/extra/mariabackup/xb0xb.h @@ -21,43 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #ifndef xb0xb_h #define xb0xb_h - -extern void os_io_init_simple(void); -extern pfs_os_file_t files[1000]; extern const char *innodb_checksum_algorithm_names[]; extern TYPELIB innodb_checksum_algorithm_typelib; -extern dberr_t open_or_create_data_files( - bool* create_new_db, -#ifdef UNIV_LOG_ARCHIVE - lsn_t* min_arch_log_no, - lsn_t* max_arch_log_no, -#endif - lsn_t* flushed_lsn, - ulint* sum_of_new_sizes) - ; -int -fil_file_readdir_next_file( -/*=======================*/ -dberr_t* err, /*!< out: this is set to DB_ERROR if an error - was encountered, otherwise not changed */ - const char* dirname,/*!< in: directory name or path */ - os_file_dir_t dir, /*!< in: directory stream */ - os_file_stat_t* info) /*!< in/out: buffer where the - info is returned */; -fil_space_t* -fil_space_get_by_name(const char *); -ibool -recv_check_cp_is_consistent(const byte* buf); -void -innodb_log_checksum_func_update( -/*============================*/ -ulint algorithm) /*!< in: algorithm */; -dberr_t -srv_undo_tablespaces_init( -/*======================*/ -ibool create_new_db, -ibool backup_mode, -const ulint n_conf_tablespaces, -ulint* n_opened); #endif diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index baad5b12118..6e9c172efc1 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -4,6 +4,8 @@ XtraBackup: hot backup tool for InnoDB Originally Created 3/3/2009 Yasufumi Kinoshita Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko, Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz. +(c) 2017, MariaDB Corporation. +Portions written by Marko Mäkelä. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,6 +43,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA //#define XTRABACKUP_TARGET_IS_PLUGIN +#include +#include #include #include #include @@ -61,6 +65,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include #include #include +#include #include #include #include @@ -85,7 +90,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include "xbstream.h" #include "changed_page_bitmap.h" #include "read_filt.h" -#include "wsrep.h" +#include "backup_wsrep.h" #include "innobackupex.h" #include "backup_mysql.h" #include "backup_copy.h" @@ -95,48 +100,39 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include #include #include - -/* TODO: replace with appropriate macros used in InnoDB 5.6 */ -#define PAGE_ZIP_MIN_SIZE_SHIFT 10 -#define DICT_TF_ZSSIZE_SHIFT 1 -#define DICT_TF_FORMAT_ZIP 1 -#define DICT_TF_FORMAT_SHIFT 5 +#include int sys_var_init(); -my_bool innodb_inited= 0; - /* === xtrabackup specific options === */ char xtrabackup_real_target_dir[FN_REFLEN] = "./xtrabackup_backupfiles/"; char *xtrabackup_target_dir= xtrabackup_real_target_dir; -my_bool xtrabackup_version = FALSE; -my_bool xtrabackup_backup = FALSE; -my_bool xtrabackup_prepare = FALSE; -my_bool xtrabackup_copy_back = FALSE; -my_bool xtrabackup_move_back = FALSE; -my_bool xtrabackup_decrypt_decompress = FALSE; -my_bool xtrabackup_print_param = FALSE; +static my_bool xtrabackup_version; +my_bool xtrabackup_backup; +my_bool xtrabackup_prepare; +my_bool xtrabackup_copy_back; +my_bool xtrabackup_move_back; +my_bool xtrabackup_decrypt_decompress; +my_bool xtrabackup_print_param; -my_bool xtrabackup_export = FALSE; -my_bool xtrabackup_apply_log_only = FALSE; +my_bool xtrabackup_export; -longlong xtrabackup_use_memory = 100*1024*1024L; -my_bool xtrabackup_create_ib_logfile = FALSE; +longlong xtrabackup_use_memory; -long xtrabackup_throttle = 0; /* 0:unlimited */ -lint io_ticket; -os_event_t wait_throttle = NULL; -os_event_t log_copying_stop = NULL; +long xtrabackup_throttle; /* 0:unlimited */ +static lint io_ticket; +static os_event_t wait_throttle; +static os_event_t log_copying_stop; -char *xtrabackup_incremental = NULL; +char *xtrabackup_incremental; lsn_t incremental_lsn; lsn_t incremental_to_lsn; lsn_t incremental_last_lsn; -xb_page_bitmap *changed_page_bitmap = NULL; +xb_page_bitmap *changed_page_bitmap; -char *xtrabackup_incremental_basedir = NULL; /* for --backup */ -char *xtrabackup_extra_lsndir = NULL; /* for --backup with --extra-lsndir */ -char *xtrabackup_incremental_dir = NULL; /* for --prepare */ +char *xtrabackup_incremental_basedir; /* for --backup */ +char *xtrabackup_extra_lsndir; /* for --backup with --extra-lsndir */ +char *xtrabackup_incremental_dir; /* for --prepare */ char xtrabackup_real_incremental_basedir[FN_REFLEN]; char xtrabackup_real_extra_lsndir[FN_REFLEN]; @@ -144,9 +140,9 @@ char xtrabackup_real_incremental_dir[FN_REFLEN]; char *xtrabackup_tmpdir; -char *xtrabackup_tables = NULL; -char *xtrabackup_tables_file = NULL; -char *xtrabackup_tables_exclude = NULL; +char *xtrabackup_tables; +char *xtrabackup_tables_file; +char *xtrabackup_tables_exclude; typedef std::list regex_list_t; static regex_list_t regex_include_list; @@ -170,17 +166,12 @@ struct xb_filter_entry_struct{ }; typedef struct xb_filter_entry_struct xb_filter_entry_t; -static ulint thread_nr[SRV_MAX_N_IO_THREADS + 6]; -static os_thread_id_t thread_ids[SRV_MAX_N_IO_THREADS + 6]; - lsn_t checkpoint_lsn_start; lsn_t checkpoint_no_start; -lsn_t log_copy_scanned_lsn; -ibool log_copying = TRUE; -ibool log_copying_running = FALSE; -ibool io_watching_thread_running = FALSE; - -ibool xtrabackup_logfile_is_renamed = FALSE; +static lsn_t log_copy_scanned_lsn; +static bool log_copying; +static bool log_copying_running; +static bool io_watching_thread_running; int xtrabackup_parallel; @@ -199,19 +190,16 @@ ulint xtrabackup_log_copy_interval = 1000; static ulong max_buf_pool_modified_pct; /* Ignored option (--log) for MySQL option compatibility */ -char* log_ignored_opt = NULL; +static char* log_ignored_opt; /* === metadata of backup === */ #define XTRABACKUP_METADATA_FILENAME "xtrabackup_checkpoints" -char metadata_type[30] = ""; /*[full-backuped|log-applied| - full-prepared|incremental]*/ -lsn_t metadata_from_lsn = 0; -lsn_t metadata_to_lsn = 0; -lsn_t metadata_last_lsn = 0; +char metadata_type[30] = ""; /*[full-backuped|log-applied|incremental]*/ +lsn_t metadata_from_lsn; +lsn_t metadata_to_lsn; +lsn_t metadata_last_lsn; -#define XB_LOG_FILENAME "xtrabackup_logfile" - -ds_file_t *dst_log_file = NULL; +static ds_file_t* dst_log_file; static char mysql_data_home_buff[2]; @@ -227,24 +215,17 @@ ulong innobase_large_page_size = 0; /* The default values for the following, type long or longlong, start-up parameters are declared in mysqld.cc: */ -long innobase_additional_mem_pool_size = 1*1024*1024L; long innobase_buffer_pool_awe_mem_mb = 0; long innobase_file_io_threads = 4; long innobase_read_io_threads = 4; long innobase_write_io_threads = 4; -long innobase_force_recovery = 0; long innobase_log_buffer_size = 1024*1024L; -long innobase_log_files_in_group = 2; long innobase_open_files = 300L; longlong innobase_page_size = (1LL << 14); /* 16KB */ -static ulong innobase_log_block_size = 512; -my_bool innobase_fast_checksum = FALSE; -char* innobase_doublewrite_file = NULL; char* innobase_buffer_pool_filename = NULL; longlong innobase_buffer_pool_size = 8*1024*1024L; -longlong innobase_log_file_size = 48*1024*1024L; /* The default values for the following char* start-up parameters are determined in innobase_init below: */ @@ -256,20 +237,12 @@ char* innobase_data_file_path = NULL; affects Windows: */ char* innobase_unix_file_flush_method = NULL; -/* Below we have boolean-valued start-up parameters, and their default -values */ - -ulong innobase_fast_shutdown = 1; -my_bool innobase_use_doublewrite = TRUE; -my_bool innobase_use_checksums = TRUE; -my_bool innobase_use_large_pages = FALSE; -my_bool innobase_file_per_table = FALSE; -my_bool innobase_locks_unsafe_for_binlog = FALSE; -my_bool innobase_rollback_on_timeout = FALSE; -my_bool innobase_create_status_file = FALSE; -my_bool innobase_adaptive_hash_index = TRUE; - -static char *internal_innobase_data_file_path = NULL; +my_bool innobase_use_doublewrite; +my_bool innobase_use_large_pages; +my_bool innobase_file_per_table; +my_bool innobase_locks_unsafe_for_binlog; +my_bool innobase_rollback_on_timeout; +my_bool innobase_create_status_file; /* The following counter is used to convey information to InnoDB about server activity: in selects it is not sensible to call @@ -290,7 +263,7 @@ lsn_t flushed_lsn= 0; ulong xb_open_files_limit= 0; char *xb_plugin_dir; char *xb_plugin_load; -my_bool xb_close_files= FALSE; +my_bool xb_close_files; /* Datasinks */ ds_ctxt_t *ds_data = NULL; @@ -299,10 +272,6 @@ ds_ctxt_t *ds_redo = NULL; static bool innobackupex_mode = false; -static long innobase_log_files_in_group_save; -static char *srv_log_group_home_dir_save; -static longlong innobase_log_file_size_save; - /* String buffer used by --print-param to accumulate server options as they are parsed from the defaults file */ static std::ostringstream print_param_str; @@ -313,6 +282,7 @@ std::set param_set; static ulonglong global_max_value; extern "C" sig_handler handle_fatal_signal(int sig); +extern LOGGER logger; my_bool opt_galera_info = FALSE; my_bool opt_slave_info = FALSE; @@ -361,9 +331,6 @@ const char *opt_history = NULL; #if defined(HAVE_OPENSSL) my_bool opt_ssl_verify_server_cert = FALSE; -#if !defined(HAVE_YASSL) -char *opt_server_public_key = NULL; -#endif #endif /* Whether xtrabackup_binlog_info should be created on recovery */ @@ -383,14 +350,23 @@ xtrabackup_add_datasink(ds_ctxt_t *ds) } /* ======== Datafiles iterator ======== */ +struct datafiles_iter_t { + fil_system_t *system; + fil_space_t *space; + fil_node_t *node; + ibool started; + pthread_mutex_t mutex; +}; + +/* ======== Datafiles iterator ======== */ +static datafiles_iter_t * datafiles_iter_new(fil_system_t *f_system) { datafiles_iter_t *it; - it = static_cast - (ut_malloc(sizeof(datafiles_iter_t))); - it->mutex = os_mutex_create(); + it = static_cast(malloc(sizeof(datafiles_iter_t))); + pthread_mutex_init(&it->mutex, NULL); it->system = f_system; it->space = NULL; @@ -400,12 +376,13 @@ datafiles_iter_new(fil_system_t *f_system) return it; } +static fil_node_t * datafiles_iter_next(datafiles_iter_t *it) { fil_node_t *new_node; - os_mutex_enter(it->mutex); + pthread_mutex_lock(&it->mutex); if (it->node == NULL) { if (it->started) @@ -422,7 +399,7 @@ datafiles_iter_next(datafiles_iter_t *it) UT_LIST_GET_NEXT(space_list, it->space); while (it->space != NULL && - (it->space->purpose != FIL_TABLESPACE || + (it->space->purpose != FIL_TYPE_TABLESPACE || UT_LIST_GET_LEN(it->space->chain) == 0)) it->space = UT_LIST_GET_NEXT(space_list, it->space); if (it->space == NULL) @@ -432,16 +409,17 @@ datafiles_iter_next(datafiles_iter_t *it) end: new_node = it->node; - os_mutex_exit(it->mutex); + pthread_mutex_unlock(&it->mutex); return new_node; } +static void datafiles_iter_free(datafiles_iter_t *it) { - os_mutex_free(it->mutex); - ut_free(it); + pthread_mutex_destroy(&it->mutex); + free(it); } /* ======== Date copying thread context ======== */ @@ -450,7 +428,7 @@ typedef struct { datafiles_iter_t *it; uint num; uint *count; - os_ib_mutex_t count_mutex; + pthread_mutex_t count_mutex; os_thread_id_t id; } data_thread_ctxt_t; @@ -463,7 +441,6 @@ enum options_xtrabackup OPT_XTRA_BACKUP, OPT_XTRA_PREPARE, OPT_XTRA_EXPORT, - OPT_XTRA_APPLY_LOG_ONLY, OPT_XTRA_PRINT_PARAM, OPT_XTRA_USE_MEMORY, OPT_XTRA_THROTTLE, @@ -476,7 +453,6 @@ enum options_xtrabackup OPT_XTRA_TABLES_FILE, OPT_XTRA_DATABASES, OPT_XTRA_DATABASES_FILE, - OPT_XTRA_CREATE_IB_LOGFILE, OPT_XTRA_PARALLEL, OPT_XTRA_STREAM, OPT_XTRA_COMPRESS, @@ -484,12 +460,10 @@ enum options_xtrabackup OPT_XTRA_COMPRESS_CHUNK_SIZE, OPT_LOG, OPT_INNODB, - OPT_INNODB_CHECKSUMS, OPT_INNODB_DATA_FILE_PATH, OPT_INNODB_DATA_HOME_DIR, OPT_INNODB_ADAPTIVE_HASH_INDEX, OPT_INNODB_DOUBLEWRITE, - OPT_INNODB_FAST_SHUTDOWN, OPT_INNODB_FILE_PER_TABLE, OPT_INNODB_FLUSH_LOG_AT_TRX_COMMIT, OPT_INNODB_FLUSH_METHOD, @@ -499,7 +473,6 @@ enum options_xtrabackup OPT_INNODB_MAX_PURGE_LAG, OPT_INNODB_ROLLBACK_ON_TIMEOUT, OPT_INNODB_STATUS_FILE, - OPT_INNODB_ADDITIONAL_MEM_POOL_SIZE, OPT_INNODB_AUTOEXTEND_INCREMENT, OPT_INNODB_BUFFER_POOL_SIZE, OPT_INNODB_COMMIT_CONCURRENCY, @@ -510,25 +483,17 @@ enum options_xtrabackup OPT_INNODB_WRITE_IO_THREADS, OPT_INNODB_USE_NATIVE_AIO, OPT_INNODB_PAGE_SIZE, - OPT_INNODB_LOG_BLOCK_SIZE, - OPT_INNODB_FAST_CHECKSUM, - OPT_INNODB_EXTRA_UNDOSLOTS, - OPT_INNODB_DOUBLEWRITE_FILE, OPT_INNODB_BUFFER_POOL_FILENAME, - OPT_INNODB_FORCE_RECOVERY, OPT_INNODB_LOCK_WAIT_TIMEOUT, OPT_INNODB_LOG_BUFFER_SIZE, OPT_INNODB_LOG_FILE_SIZE, OPT_INNODB_LOG_FILES_IN_GROUP, OPT_INNODB_OPEN_FILES, - OPT_INNODB_SYNC_SPIN_LOOPS, - OPT_INNODB_THREAD_CONCURRENCY, - OPT_INNODB_THREAD_SLEEP_DELAY, OPT_XTRA_DEBUG_SYNC, OPT_INNODB_CHECKSUM_ALGORITHM, OPT_INNODB_UNDO_DIRECTORY, OPT_INNODB_UNDO_TABLESPACES, - OPT_INNODB_LOG_CHECKSUM_ALGORITHM, + OPT_INNODB_LOG_CHECKSUMS, OPT_XTRA_INCREMENTAL_FORCE_SCAN, OPT_DEFAULTS_GROUP, OPT_OPEN_FILES_LIMIT, @@ -563,10 +528,6 @@ enum options_xtrabackup OPT_BINLOG_INFO, OPT_XB_SECURE_AUTH, - OPT_SSL_SSL, - OPT_SSL_VERIFY_SERVER_CERT, - OPT_SERVER_PUBLIC_KEY, - OPT_XTRA_TABLES_EXCLUDE, OPT_XTRA_DATABASES_EXCLUDE, }; @@ -587,10 +548,6 @@ struct my_option xb_client_options[] = {"export", OPT_XTRA_EXPORT, "create files to import to another database when prepare.", (G_PTR*) &xtrabackup_export, (G_PTR*) &xtrabackup_export, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"apply-log-only", OPT_XTRA_APPLY_LOG_ONLY, - "stop recovery process not to progress LSN after applying log when prepare.", - (G_PTR*) &xtrabackup_apply_log_only, (G_PTR*) &xtrabackup_apply_log_only, - 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"print-param", OPT_XTRA_PRINT_PARAM, "print parameter of mysqld needed for copyback.", (G_PTR*) &xtrabackup_print_param, (G_PTR*) &xtrabackup_print_param, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, @@ -628,7 +585,7 @@ struct my_option xb_client_options[] = {"databases", OPT_XTRA_DATABASES, "filtering by list of databases.", (G_PTR*) &xtrabackup_databases, (G_PTR*) &xtrabackup_databases, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"databases_file", OPT_XTRA_TABLES_FILE, + {"databases_file", OPT_XTRA_DATABASES_FILE, "filtering by list of databases in the file.", (G_PTR*) &xtrabackup_databases_file, (G_PTR*) &xtrabackup_databases_file, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -642,9 +599,6 @@ struct my_option xb_client_options[] = "Note that this option has a higher priority than --databases.", (G_PTR*) &xtrabackup_databases_exclude, (G_PTR*) &xtrabackup_databases_exclude, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"create-ib-logfile", OPT_XTRA_CREATE_IB_LOGFILE, "** not work for now** creates ib_logfile* also after '--prepare'. ### If you want create ib_logfile*, only re-execute this command in same options. ###", - (G_PTR*) &xtrabackup_create_ib_logfile, (G_PTR*) &xtrabackup_create_ib_logfile, - 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"stream", OPT_XTRA_STREAM, "Stream all backup files to the standard output " "in the specified format." @@ -922,6 +876,11 @@ struct my_option xb_client_options[] = uint xb_client_options_count = array_elements(xb_client_options); +#ifndef DBUG_OFF +/** Parameters to DBUG */ +static const char *dbug_option; +#endif + struct my_option xb_server_options[] = { {"datadir", 'h', "Path to the database root.", (G_PTR*) &mysql_data_home, @@ -952,40 +911,34 @@ struct my_option xb_server_options[] = {"innodb", OPT_INNODB, "Ignored option for MySQL option compatibility", (G_PTR*) &innobase_ignored_opt, (G_PTR*) &innobase_ignored_opt, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, - +#ifdef BTR_CUR_HASH_ADAPT {"innodb_adaptive_hash_index", OPT_INNODB_ADAPTIVE_HASH_INDEX, "Enable InnoDB adaptive hash index (enabled by default). " "Disable with --skip-innodb-adaptive-hash-index.", - (G_PTR*) &innobase_adaptive_hash_index, - (G_PTR*) &innobase_adaptive_hash_index, + &btr_search_enabled, + &btr_search_enabled, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, - {"innodb_additional_mem_pool_size", OPT_INNODB_ADDITIONAL_MEM_POOL_SIZE, - "Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures.", - (G_PTR*) &innobase_additional_mem_pool_size, - (G_PTR*) &innobase_additional_mem_pool_size, 0, GET_LONG, REQUIRED_ARG, - 1*1024*1024L, 512*1024L, LONG_MAX, 0, 1024, 0}, +#endif /* BTR_CUR_HASH_ADAPT */ {"innodb_autoextend_increment", OPT_INNODB_AUTOEXTEND_INCREMENT, "Data file autoextend increment in megabytes", - (G_PTR*) &srv_auto_extend_increment, - (G_PTR*) &srv_auto_extend_increment, + (G_PTR*) &sys_tablespace_auto_extend_increment, + (G_PTR*) &sys_tablespace_auto_extend_increment, 0, GET_ULONG, REQUIRED_ARG, 8L, 1L, 1000L, 0, 1L, 0}, {"innodb_buffer_pool_size", OPT_INNODB_BUFFER_POOL_SIZE, "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.", (G_PTR*) &innobase_buffer_pool_size, (G_PTR*) &innobase_buffer_pool_size, 0, GET_LL, REQUIRED_ARG, 8*1024*1024L, 1024*1024L, LONGLONG_MAX, 0, 1024*1024L, 0}, - {"innodb_checksums", OPT_INNODB_CHECKSUMS, "Enable InnoDB checksums validation (enabled by default). \ -Disable with --skip-innodb-checksums.", (G_PTR*) &innobase_use_checksums, - (G_PTR*) &innobase_use_checksums, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"innodb_data_file_path", OPT_INNODB_DATA_FILE_PATH, "Path to individual files and their sizes.", &innobase_data_file_path, &innobase_data_file_path, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"innodb_data_home_dir", OPT_INNODB_DATA_HOME_DIR, "The common part for InnoDB table spaces.", &innobase_data_home_dir, &innobase_data_home_dir, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"innodb_doublewrite", OPT_INNODB_DOUBLEWRITE, "Enable InnoDB doublewrite buffer (enabled by default). \ -Disable with --skip-innodb-doublewrite.", (G_PTR*) &innobase_use_doublewrite, - (G_PTR*) &innobase_use_doublewrite, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, + {"innodb_doublewrite", OPT_INNODB_DOUBLEWRITE, + "Enable InnoDB doublewrite buffer during --prepare.", + (G_PTR*) &innobase_use_doublewrite, + (G_PTR*) &innobase_use_doublewrite, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"innodb_io_capacity", OPT_INNODB_IO_CAPACITY, "Number of IOPs the server can do. Tunes the background IO rate", (G_PTR*) &srv_io_capacity, (G_PTR*) &srv_io_capacity, @@ -1013,26 +966,19 @@ Disable with --skip-innodb-doublewrite.", (G_PTR*) &innobase_use_doublewrite, (G_PTR*) &innobase_unix_file_flush_method, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, -/* ####### Should we use this option? ####### */ - {"innodb_force_recovery", OPT_INNODB_FORCE_RECOVERY, - "Helps to save your data in case the disk image of the database becomes corrupt.", - (G_PTR*) &innobase_force_recovery, (G_PTR*) &innobase_force_recovery, 0, - GET_LONG, REQUIRED_ARG, 0, 0, 6, 0, 1, 0}, - {"innodb_log_buffer_size", OPT_INNODB_LOG_BUFFER_SIZE, "The size of the buffer which InnoDB uses to write log to the log files on disk.", (G_PTR*) &innobase_log_buffer_size, (G_PTR*) &innobase_log_buffer_size, 0, GET_LONG, REQUIRED_ARG, 1024*1024L, 256*1024L, LONG_MAX, 0, 1024, 0}, {"innodb_log_file_size", OPT_INNODB_LOG_FILE_SIZE, - "Size of each log file in a log group.", - (G_PTR*) &innobase_log_file_size, (G_PTR*) &innobase_log_file_size, 0, - GET_LL, REQUIRED_ARG, 48*1024*1024L, 1*1024*1024L, LONGLONG_MAX, 0, - 1024*1024L, 0}, + "Ignored for mysqld option compatibility", + (G_PTR*) &srv_log_file_size, (G_PTR*) &srv_log_file_size, 0, + GET_ULL, REQUIRED_ARG, 48 << 20, 1 << 20, 512ULL << 30, 0, + UNIV_PAGE_SIZE_MAX, 0}, {"innodb_log_files_in_group", OPT_INNODB_LOG_FILES_IN_GROUP, - "Number of log files in the log group. InnoDB writes to the files in a " - "circular fashion. Value 3 is recommended here.", - &innobase_log_files_in_group, &innobase_log_files_in_group, - 0, GET_LONG, REQUIRED_ARG, 2, 2, 100, 0, 1, 0}, + "Ignored for mysqld option compatibility", + &srv_n_log_files, &srv_n_log_files, + 0, GET_LONG, REQUIRED_ARG, 1, 1, 100, 0, 1, 0}, {"innodb_log_group_home_dir", OPT_INNODB_LOG_GROUP_HOME_DIR, "Path to InnoDB log files.", &srv_log_group_home_dir, &srv_log_group_home_dir, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -1054,25 +1000,17 @@ Disable with --skip-innodb-doublewrite.", (G_PTR*) &innobase_use_doublewrite, /* Use GET_LL to support numeric suffixes in 5.6 */ GET_LL, REQUIRED_ARG, (1LL << 14), (1LL << 12), (1LL << UNIV_PAGE_SIZE_SHIFT_MAX), 0, 1L, 0}, - {"innodb_log_block_size", OPT_INNODB_LOG_BLOCK_SIZE, - "The log block size of the transaction log file. " - "Changing for created log file is not supported. Use on your own risk!", - (G_PTR*) &innobase_log_block_size, (G_PTR*) &innobase_log_block_size, 0, - GET_ULONG, REQUIRED_ARG, 512, 512, 1 << UNIV_PAGE_SIZE_SHIFT_MAX, 0, 1L, 0}, - {"innodb_fast_checksum", OPT_INNODB_FAST_CHECKSUM, - "Change the algorithm of checksum for the whole of datapage to 4-bytes word based.", - (G_PTR*) &innobase_fast_checksum, - (G_PTR*) &innobase_fast_checksum, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"innodb_doublewrite_file", OPT_INNODB_DOUBLEWRITE_FILE, - "Path to special datafile for doublewrite buffer. (default is "": not used)", - (G_PTR*) &innobase_doublewrite_file, (G_PTR*) &innobase_doublewrite_file, - 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"innodb_buffer_pool_filename", OPT_INNODB_BUFFER_POOL_FILENAME, - "Filename to/from which to dump/load the InnoDB buffer pool", + "Ignored for mysqld option compatibility", (G_PTR*) &innobase_buffer_pool_filename, (G_PTR*) &innobase_buffer_pool_filename, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, +#ifndef DBUG_OFF /* unfortunately "debug" collides with existing options */ + {"dbug", '#', "Built in DBUG debugger.", + &dbug_option, &dbug_option, 0, GET_STR, OPT_ARG, + 0, 0, 0, 0, 0, 0}, +#endif #ifndef __WIN__ {"debug-sync", OPT_XTRA_DEBUG_SYNC, "Debug sync point. This is only used by the xtrabackup test suite", @@ -1086,11 +1024,7 @@ Disable with --skip-innodb-doublewrite.", (G_PTR*) &innobase_use_doublewrite, "INNODB, STRICT_INNODB, NONE, STRICT_NONE]", &srv_checksum_algorithm, &srv_checksum_algorithm, &innodb_checksum_algorithm_typelib, GET_ENUM, REQUIRED_ARG, SRV_CHECKSUM_ALGORITHM_INNODB, 0, 0, 0, 0, 0}, - {"innodb_log_checksum_algorithm", OPT_INNODB_LOG_CHECKSUM_ALGORITHM, - "The algorithm InnoDB uses for log checksumming. [CRC32, STRICT_CRC32, " - "INNODB, STRICT_INNODB, NONE, STRICT_NONE]", &srv_log_checksum_algorithm, - &srv_log_checksum_algorithm, &innodb_checksum_algorithm_typelib, GET_ENUM, - REQUIRED_ARG, SRV_CHECKSUM_ALGORITHM_INNODB, 0, 0, 0, 0, 0}, + {"innodb_undo_directory", OPT_INNODB_UNDO_DIRECTORY, "Directory where undo tablespace files live, this path can be absolute.", &srv_undo_dir, &srv_undo_dir, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, @@ -1116,7 +1050,12 @@ Disable with --skip-innodb-doublewrite.", (G_PTR*) &innobase_use_doublewrite, { "innodb-encrypt-log", OPT_INNODB_ENCRYPT_LOG, "encrypton plugin to load", &srv_encrypt_log, &srv_encrypt_log, 0, GET_BOOL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, - + + {"innodb-log-checksums", OPT_INNODB_LOG_CHECKSUMS, + "Whether to require checksums for InnoDB redo log blocks", + &innodb_log_checksums, &innodb_log_checksums, + 0, GET_BOOL, REQUIRED_ARG, 1, 0, 0, 0, 0, 0 }, + {"open_files_limit", OPT_OPEN_FILES_LIMIT, "the maximum number of file " "descriptors to reserve with setrlimit().", (G_PTR*) &xb_open_files_limit, (G_PTR*) &xb_open_files_limit, 0, GET_ULONG, @@ -1270,13 +1209,7 @@ xb_get_one_option(int optid, break; case OPT_INNODB_LOG_FILES_IN_GROUP: - - ADD_PRINT_PARAM_OPT(innobase_log_files_in_group); - break; - case OPT_INNODB_LOG_FILE_SIZE: - - ADD_PRINT_PARAM_OPT(innobase_log_file_size); break; case OPT_INNODB_FLUSH_METHOD: @@ -1289,21 +1222,6 @@ xb_get_one_option(int optid, ADD_PRINT_PARAM_OPT(innobase_page_size); break; - case OPT_INNODB_FAST_CHECKSUM: - - ADD_PRINT_PARAM_OPT(!!innobase_fast_checksum); - break; - - case OPT_INNODB_LOG_BLOCK_SIZE: - - ADD_PRINT_PARAM_OPT(innobase_log_block_size); - break; - - case OPT_INNODB_DOUBLEWRITE_FILE: - - ADD_PRINT_PARAM_OPT(innobase_doublewrite_file); - break; - case OPT_INNODB_UNDO_DIRECTORY: ADD_PRINT_PARAM_OPT(srv_undo_dir); @@ -1321,13 +1239,6 @@ xb_get_one_option(int optid, ADD_PRINT_PARAM_OPT(innodb_checksum_algorithm_names[srv_checksum_algorithm]); break; - case OPT_INNODB_LOG_CHECKSUM_ALGORITHM: - - ut_a(srv_log_checksum_algorithm <= SRV_CHECKSUM_ALGORITHM_STRICT_NONE); - - ADD_PRINT_PARAM_OPT(innodb_checksum_algorithm_names[srv_log_checksum_algorithm]); - break; - case OPT_INNODB_BUFFER_POOL_FILENAME: ADD_PRINT_PARAM_OPT(innobase_buffer_pool_filename); @@ -1400,40 +1311,9 @@ xb_get_one_option(int optid, return 0; } -/*********************************************************************** -Initializes log_block_size */ -static -ibool -xb_init_log_block_size(void) -{ - srv_log_block_size = 0; - if (innobase_log_block_size != 512) { - uint n_shift = (uint)get_bit_shift(innobase_log_block_size);; - - if (n_shift > 0) { - srv_log_block_size = (ulint)(1LL << n_shift); - msg("InnoDB: The log block size is set to %lu.\n", - srv_log_block_size); - } - } else { - srv_log_block_size = 512; - } - if (!srv_log_block_size) { - msg("InnoDB: Error: %lu is not valid value for " - "innodb_log_block_size.\n", innobase_log_block_size); - return FALSE; - } - - return TRUE; -} - static my_bool innodb_init_param(void) { - /* innobase_init */ - static char current_dir[3]; /* Set if using current lib */ - my_bool ret; - char *default_path; srv_is_being_started = TRUE; /* === some variables from mysqld === */ memset((G_PTR) &mysql_tmpdir_list, 0, sizeof(mysql_tmpdir_list)); @@ -1465,10 +1345,6 @@ innodb_init_param(void) srv_page_size = (1 << srv_page_size_shift); } - if (!xb_init_log_block_size()) { - goto error; - } - /* Check that values don't overflow on 32-bit systems. */ if (sizeof(ulint) == 4) { if (xtrabackup_use_memory > UINT_MAX32) { @@ -1482,30 +1358,10 @@ innodb_init_param(void) goto error; } - - if (innobase_log_file_size > UINT_MAX32) { - msg("xtrabackup: innobase_log_file_size can't be " - "over 4GB on 32-bit systemsi\n"); - - goto error; - } } - os_innodb_umask = (ulint)0664; - - /* First calculate the default path for innodb_data_home_dir etc., - in case the user has not given any value. - - Note that when using the embedded server, the datadirectory is not - necessarily the current directory of this program. */ - - /* It's better to use current lib, to keep paths short */ - current_dir[0] = FN_CURLIB; - current_dir[1] = FN_LIBCHAR; - current_dir[2] = 0; - default_path = current_dir; - - ut_a(default_path); + static char default_path[2] = { FN_CURLIB, 0 }; + fil_path_to_mysql_datadir = default_path; /* Set InnoDB initialization parameters according to the values read from MySQL .cnf file */ @@ -1535,37 +1391,20 @@ innodb_init_param(void) msg("xtrabackup: innodb_data_file_path = %s\n", innobase_data_file_path); - /* Since InnoDB edits the argument in the next call, we make another - copy of it: */ + /* This is the first time univ_page_size is used. + It was initialized to 16k pages before srv_page_size was set */ + univ_page_size.copy_from( + page_size_t(srv_page_size, srv_page_size, false)); - internal_innobase_data_file_path = strdup(innobase_data_file_path); + srv_sys_space.set_space_id(TRX_SYS_SPACE); + srv_sys_space.set_name("innodb_system"); + srv_sys_space.set_path(srv_data_home); + srv_sys_space.set_flags(FSP_FLAGS_PAGE_SSIZE()); - ret = (my_bool) srv_parse_data_file_paths_and_sizes( - internal_innobase_data_file_path); - if (ret == FALSE) { - msg("xtrabackup: syntax error in innodb_data_file_path\n"); -mem_free_and_error: - free(internal_innobase_data_file_path); - internal_innobase_data_file_path = NULL; + if (!srv_sys_space.parse_params(innobase_data_file_path, true)) { goto error; } - if (xtrabackup_prepare) { - /* "--prepare" needs filenames only */ - ulint i; - - for (i=0; i < srv_n_data_files; i++) { - char *p; - - p = srv_data_file_names[i]; - while ((p = strchr(p, SRV_PATH_SEPARATOR)) != NULL) - { - p++; - srv_data_file_names[i] = p; - } - } - } - /* -------------- Log files ---------------------------*/ /* The default dir for log files is the datadir of MySQL */ @@ -1579,60 +1418,38 @@ mem_free_and_error: msg("xtrabackup: innodb_log_group_home_dir = %s\n", srv_log_group_home_dir); - srv_normalize_path_for_win(srv_log_group_home_dir); + os_normalize_path(srv_log_group_home_dir); if (strchr(srv_log_group_home_dir, ';')) { msg("syntax error in innodb_log_group_home_dir, "); - - goto mem_free_and_error; + goto error; } srv_adaptive_flushing = FALSE; - srv_use_sys_malloc = TRUE; srv_file_format = 1; /* Barracuda */ srv_max_file_format_at_startup = UNIV_FORMAT_MIN; /* on */ /* --------------------------------------------------*/ srv_file_flush_method_str = innobase_unix_file_flush_method; - srv_n_log_files = (ulint) innobase_log_files_in_group; - srv_log_file_size = (ulint) innobase_log_file_size; - msg("xtrabackup: innodb_log_files_in_group = %ld\n", - srv_n_log_files); - msg("xtrabackup: innodb_log_file_size = %lld\n", - (long long int) srv_log_file_size); - srv_log_buffer_size = (ulint) innobase_log_buffer_size; /* We set srv_pool_size here in units of 1 kB. InnoDB internally changes the value so that it becomes the number of database pages. */ - //srv_buf_pool_size = (ulint) innobase_buffer_pool_size; srv_buf_pool_size = (ulint) xtrabackup_use_memory; - - srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size; + srv_buf_pool_chunk_unit = srv_buf_pool_size; + srv_buf_pool_instances = 1; srv_n_file_io_threads = (ulint) innobase_file_io_threads; srv_n_read_io_threads = (ulint) innobase_read_io_threads; srv_n_write_io_threads = (ulint) innobase_write_io_threads; - srv_force_recovery = (ulint) innobase_force_recovery; - srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite; - if (!innobase_use_checksums) { - - srv_checksum_algorithm = SRV_CHECKSUM_ALGORITHM_NONE; - } - - btr_search_enabled = (char) innobase_adaptive_hash_index; - btr_search_index_num = 1; - os_use_large_pages = (ibool) innobase_use_large_pages; os_large_page_size = (ulint) innobase_large_page_size; - static char default_dir[3] = "./"; - srv_arch_dir = default_dir; row_rollback_on_timeout = (ibool) innobase_rollback_on_timeout; srv_file_per_table = (my_bool) innobase_file_per_table; @@ -1650,18 +1467,8 @@ mem_free_and_error: /* We cannot treat characterset here for now!! */ data_mysql_default_charset_coll = (ulint)default_charset_info->number; - ut_a(DATA_MYSQL_LATIN1_SWEDISH_CHARSET_COLL == - my_charset_latin1.number); ut_a(DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number); - /* Store the latin1_swedish_ci character ordering table to InnoDB. For - non-latin1_swedish_ci charsets we use the MySQL comparison functions, - and consequently we do not need to know the ordering internally in - InnoDB. */ - - ut_a(0 == strcmp(my_charset_latin1.name, "latin1_swedish_ci")); - srv_latin1_ordering = my_charset_latin1.sort_order; - //innobase_commit_concurrency_init_default(); /* Since we in this module access directly the fields of a trx @@ -1675,31 +1482,8 @@ mem_free_and_error: innobase_start_or_create_for_mysql(). As we don't call it in xtrabackup, we have to duplicate checks from that function here. */ -#ifdef __WIN__ - switch (os_get_os_version()) { - case OS_WIN95: - case OS_WIN31: - case OS_WINNT: - /* On Win 95, 98, ME, Win32 subsystem for Windows 3.1, - and NT use simulated aio. In NT Windows provides async i/o, - but when run in conjunction with InnoDB Hot Backup, it seemed - to corrupt the data files. */ - - srv_use_native_aio = FALSE; - break; - - case OS_WIN2000: - case OS_WINXP: - /* On 2000 and XP, async IO is available. */ - srv_use_native_aio = TRUE; - break; - - default: - /* Vista and later have both async IO and condition variables */ - srv_use_native_aio = TRUE; - srv_use_native_conditions = TRUE; - break; - } +#ifdef _WIN32 + srv_use_native_aio = TRUE; #elif defined(LINUX_NATIVE_AIO) @@ -1726,7 +1510,9 @@ mem_free_and_error: srv_undo_dir = my_strdup(".", MYF(MY_FAE)); } - innodb_log_checksum_func_update(srv_log_checksum_algorithm); + log_checksum_algorithm_ptr = innodb_log_checksums || srv_encrypt_log + ? log_block_calc_checksum_crc32 + : log_block_calc_checksum_none; return(FALSE); @@ -1735,57 +1521,17 @@ error: return(TRUE); } -static my_bool -innodb_init(void) +static bool innodb_init() { - int err; - srv_is_being_started = TRUE; - err = innobase_start_or_create_for_mysql(); - + dberr_t err = innobase_start_or_create_for_mysql(); if (err != DB_SUCCESS) { - free(internal_innobase_data_file_path); - internal_innobase_data_file_path = NULL; - goto error; + msg("xtrabackup: innodb_init() returned %d (%s).\n", + err, ut_strerr(err)); + innodb_shutdown(); + return(TRUE); } - /* They may not be needed for now */ -// (void) hash_init(&innobase_open_tables,system_charset_info, 32, 0, 0, -// (hash_get_key) innobase_get_key, 0, 0); -// pthread_mutex_init(&innobase_share_mutex, MY_MUTEX_INIT_FAST); -// pthread_mutex_init(&prepare_commit_mutex, MY_MUTEX_INIT_FAST); -// pthread_mutex_init(&commit_threads_m, MY_MUTEX_INIT_FAST); -// pthread_mutex_init(&commit_cond_m, MY_MUTEX_INIT_FAST); -// pthread_cond_init(&commit_cond, NULL); - - innodb_inited= 1; - return(FALSE); - -error: - msg("xtrabackup: innodb_init(): Error occured.\n"); - return(TRUE); -} - -static void -innodb_end() -{ - srv_fast_shutdown = (ulint) innobase_fast_shutdown; - innodb_inited = 0; - - msg("xtrabackup: starting shutdown with innodb_fast_shutdown = %lu\n", - srv_fast_shutdown); - - innodb_shutdown(); - free(internal_innobase_data_file_path); - internal_innobase_data_file_path = NULL; - - /* They may not be needed for now */ -// hash_free(&innobase_open_tables); -// pthread_mutex_destroy(&innobase_share_mutex); -// pthread_mutex_destroy(&prepare_commit_mutex); -// pthread_mutex_destroy(&commit_threads_m); -// pthread_mutex_destroy(&commit_cond_m); -// pthread_cond_destroy(&commit_cond); } /* ================= common ================= */ @@ -1940,8 +1686,7 @@ xb_read_delta_metadata(const char *filepath, xb_delta_info_t *info) my_bool r = TRUE; /* set defaults */ - info->page_size = ULINT_UNDEFINED; - info->zip_size = ULINT_UNDEFINED; + ulint page_size = ULINT_UNDEFINED, zip_size = 0; info->space_id = ULINT_UNDEFINED; fp = fopen(filepath, "r"); @@ -1953,9 +1698,9 @@ xb_read_delta_metadata(const char *filepath, xb_delta_info_t *info) while (!feof(fp)) { if (fscanf(fp, "%50s = %50s\n", key, value) == 2) { if (strcmp(key, "page_size") == 0) { - info->page_size = strtoul(value, NULL, 10); + page_size = strtoul(value, NULL, 10); } else if (strcmp(key, "zip_size") == 0) { - info->zip_size = strtoul(value, NULL, 10); + zip_size = strtoul(value, NULL, 10); } else if (strcmp(key, "space_id") == 0) { info->space_id = strtoul(value, NULL, 10); } @@ -1964,10 +1709,14 @@ xb_read_delta_metadata(const char *filepath, xb_delta_info_t *info) fclose(fp); - if (info->page_size == ULINT_UNDEFINED) { + if (page_size == ULINT_UNDEFINED) { msg("xtrabackup: page_size is required in %s\n", filepath); r = FALSE; + } else { + info->page_size = page_size_t(zip_size ? zip_size : page_size, + page_size, zip_size != 0); } + if (info->space_id == ULINT_UNDEFINED) { msg("xtrabackup: Warning: This backup was taken with XtraBackup 2.0.1 " "or earlier, some DDL operations between full and incremental " @@ -1993,7 +1742,10 @@ xb_write_delta_metadata(const char *filename, const xb_delta_info_t *info) "page_size = %lu\n" "zip_size = %lu\n" "space_id = %lu\n", - info->page_size, info->zip_size, info->space_id); + info->page_size.logical(), + info->page_size.is_compressed() + ? info->page_size.physical() : 0, + info->space_id); len = strlen(buf); mystat.st_size = len; @@ -2150,7 +1902,7 @@ check_if_skip_database_by_path( return(FALSE); } - const char* db_name = strrchr(path, SRV_PATH_SEPARATOR); + const char* db_name = strrchr(path, OS_PATH_SEPARATOR); if (db_name == NULL) { db_name = path; } else { @@ -2258,33 +2010,26 @@ check_if_skip_table( return(FALSE); } -/*********************************************************************** -Reads the space flags from a given data file and returns the compressed -page size, or 0 if the space is not compressed. */ -ulint -xb_get_zip_size(pfs_os_file_t file) +/** @return the tablespace flags from a given data file +@retval ULINT_UNDEFINED if the file is not readable */ +ulint xb_get_space_flags(pfs_os_file_t file) { byte *buf; byte *page; - ulint zip_size = ULINT_UNDEFINED; - ibool success; - ulint space; + ulint flags; - buf = static_cast(ut_malloc(2 * UNIV_PAGE_SIZE)); + buf = static_cast(malloc(2 * UNIV_PAGE_SIZE)); page = static_cast(ut_align(buf, UNIV_PAGE_SIZE)); - success = os_file_read(file, page, 0, UNIV_PAGE_SIZE); - if (!success) { - goto end; + if (os_file_read(IORequestRead, file, page, 0, UNIV_PAGE_SIZE)) { + flags = fsp_header_get_flags(page); + } else { + flags = ULINT_UNDEFINED; } - space = mach_read_from_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID); - zip_size = (space == 0 ) ? 0 : - dict_tf_get_zip_size(fsp_header_get_flags(page)); -end: - ut_free(buf); + free(buf); - return(zip_size); + return(flags); } const char* @@ -2323,7 +2068,6 @@ xtrabackup_copy_datafile(fil_node_t* node, uint thread_n) xb_write_filt_ctxt_t write_filt_ctxt; const char *action; xb_read_filt_t *read_filter; - ibool is_system; my_bool rc = FALSE; /* Get the name and the path for the tablespace. node->name always @@ -2338,9 +2082,8 @@ xtrabackup_copy_datafile(fil_node_t* node, uint thread_n) const char* const node_name = node->space->name; const char* const node_path = node->name; - is_system = !fil_is_user_tablespace_id(node->space->id); - - if (!is_system && check_if_skip_table(node_name)) { + if (fil_is_user_tablespace_id(node->space->id) + && check_if_skip_table(node_name)) { msg("[%02u] Skipping %s.\n", thread_n, node_name); return(FALSE); } @@ -2449,50 +2192,29 @@ skip: return(FALSE); } -extern ibool log_block_checksum_is_ok_or_old_format(const byte* block); - -/*******************************************************//** -Scans log from a buffer and writes new log data to the outpud datasinc. -@return true if success */ +/** Copy redo log blocks to the data sink. +@param[in] is_last whether this is the last log segment to copy +@param[in] start_lsn buffer start LSN +@param[in] end_lsn buffer end LSN +@return last copied LSN +@retval 0 on failure */ static -bool -xtrabackup_scan_log_recs( -/*===============*/ - log_group_t* group, /*!< in: log group */ - bool is_last, /*!< in: whether it is last segment - to copy */ - lsn_t start_lsn, /*!< in: buffer start lsn */ - lsn_t* contiguous_lsn, /*!< in/out: it is known that all log - groups contain contiguous log data up - to this lsn */ - lsn_t* group_scanned_lsn,/*!< out: scanning succeeded up to - this lsn */ - bool* finished) /*!< out: false if is not able to scan - any more in this log group */ +lsn_t +xtrabackup_copy_log(bool is_last, lsn_t start_lsn, lsn_t end_lsn) { - lsn_t scanned_lsn; - ulint data_len; - ulint write_size; - const byte* log_block; + lsn_t scanned_lsn = start_lsn; - ulint scanned_checkpoint_no = 0; + const ulint blocks_in_group = log_block_convert_lsn_to_no( + log_sys->log.capacity()) - 1; + const byte* log_block = log_sys->buf; - *finished = false; - scanned_lsn = start_lsn; - log_block = log_sys->buf; - - while (log_block < log_sys->buf + RECV_SCAN_SIZE && !*finished) { + for (ulint scanned_checkpoint = 0; + scanned_lsn < end_lsn; + log_block += OS_FILE_LOG_BLOCK_SIZE) { ulint no = log_block_get_hdr_no(log_block); ulint scanned_no = log_block_convert_lsn_to_no(scanned_lsn); - ibool checksum_is_ok = - log_block_checksum_is_ok_or_old_format(log_block); - - if (no != scanned_no && checksum_is_ok) { - ulint blocks_in_group; - - blocks_in_group = log_block_convert_lsn_to_no( - log_group_get_capacity(group)) - 1; + if (no != scanned_no) { if ((no < scanned_no && ((scanned_no - no) % blocks_in_group) == 0) || no == 0 || @@ -2501,15 +2223,15 @@ xtrabackup_scan_log_recs( blocks_in_group == 0) { /* old log block, do nothing */ - *finished = true; break; } msg("xtrabackup: error:" " log block numbers mismatch:\n" - "xtrabackup: error: expected log block no. %lu," - " but got no. %lu from the log file.\n", - (ulong) scanned_no, (ulong) no); + "xtrabackup: error: expected log block no. " + ULINTPF ", but got no. " ULINTPF + " from the log file.\n", + scanned_no, no); if ((no - scanned_no) % blocks_in_group == 0) { msg("xtrabackup: error:" @@ -2520,155 +2242,115 @@ xtrabackup_scan_log_recs( " log files being too small.\n"); } - return(false); - } else if (!checksum_is_ok) { - /* Garbage or an incompletely written log block */ - - msg("xtrabackup: warning: Log block checksum mismatch" - " (block no %lu at lsn " LSN_PF "): \n" - "expected %lu, calculated checksum %lu\n", - (ulong) no, - scanned_lsn, - (ulong) log_block_get_checksum(log_block), - (ulong) log_block_calc_checksum(log_block)); - msg("xtrabackup: warning: this is possible when the " - "log block has not been fully written by the " - "server, will retry later.\n"); - *finished = true; - break; + return(0); } - if (log_block_get_flush_bit(log_block)) { - /* This block was a start of a log flush operation: - we know that the previous flush operation must have - been completed for all log groups before this block - can have been flushed to any of the groups. Therefore, - we know that log data is contiguous up to scanned_lsn - in all non-corrupt log groups. */ - - if (scanned_lsn > *contiguous_lsn) { - - *contiguous_lsn = scanned_lsn; - } - } - - data_len = log_block_get_data_len(log_block); - - if ( - (scanned_checkpoint_no > 0) - && (log_block_get_checkpoint_no(log_block) - < scanned_checkpoint_no) - && (scanned_checkpoint_no - - log_block_get_checkpoint_no(log_block) - > 0x80000000UL)) { + ulint checkpoint = log_block_get_checkpoint_no(log_block); + if (scanned_checkpoint > checkpoint + && scanned_checkpoint - checkpoint >= 0x80000000UL) { /* Garbage from a log buffer flush which was made before the most recent database recovery */ - - *finished = true; break; } - scanned_lsn = scanned_lsn + data_len; - scanned_checkpoint_no = log_block_get_checkpoint_no(log_block); + scanned_checkpoint = checkpoint; + ulint data_len = log_block_get_data_len(log_block); + scanned_lsn += data_len; - if (data_len < OS_FILE_LOG_BLOCK_SIZE) { - /* Log data for this group ends here */ - - *finished = true; - } else { - log_block += OS_FILE_LOG_BLOCK_SIZE; + if (data_len != OS_FILE_LOG_BLOCK_SIZE) { + break; } } - *group_scanned_lsn = scanned_lsn; + if (!is_last && scanned_lsn & (OS_FILE_LOG_BLOCK_SIZE - 1)) { + /* Omit the partial last block. */ + scanned_lsn &= ~(OS_FILE_LOG_BLOCK_SIZE - 1); + } - /* ===== write log to 'xtrabackup_logfile' ====== */ - if (!*finished) { - write_size = RECV_SCAN_SIZE; - } else { - write_size = (ulint)(ut_uint64_align_up(scanned_lsn, - OS_FILE_LOG_BLOCK_SIZE) - start_lsn); - if (!is_last && scanned_lsn % OS_FILE_LOG_BLOCK_SIZE) { - write_size -= OS_FILE_LOG_BLOCK_SIZE; + log_sys->log.scanned_lsn = scanned_lsn; + + if (ulint write_size = ulint(ut_uint64_align_up(scanned_lsn, + OS_FILE_LOG_BLOCK_SIZE) + - start_lsn)) { + if (srv_encrypt_log) { + log_crypt(log_sys->buf, write_size); + } + + if (ds_write(dst_log_file, log_sys->buf, write_size)) { + msg("xtrabackup: Error: " + "write to logfile failed\n"); + return(0); } } - if (write_size == 0) { - return(true); - } - - if (srv_encrypt_log) { - log_encrypt_before_write(scanned_checkpoint_no, - log_sys->buf, write_size); - } - - if (ds_write(dst_log_file, log_sys->buf, write_size)) { - msg("xtrabackup: Error: " - "write to logfile failed\n"); - return(false); - } - - return(true); + return(scanned_lsn); } -static my_bool -xtrabackup_copy_logfile(lsn_t from_lsn, my_bool is_last) +/** Copy redo log until the current end of the log is reached +@param is_last whether this is the last run at the end of backup +@return whether the operation failed */ +static bool +xtrabackup_copy_logfile(bool is_last) { - /* definition from recv_recovery_from_checkpoint_start() */ - lsn_t contiguous_lsn; - ut_a(dst_log_file != NULL); + ut_ad(recv_sys != NULL); - /* read from checkpoint_lsn_start to current */ - contiguous_lsn = ut_uint64_align_down(from_lsn, OS_FILE_LOG_BLOCK_SIZE); - - /* TODO: We must check the contiguous_lsn still exists in log file.. */ - - bool finished; lsn_t start_lsn; lsn_t end_lsn; - /* reference recv_group_scan_log_recs() */ + start_lsn = ut_uint64_align_down(log_copy_scanned_lsn, + OS_FILE_LOG_BLOCK_SIZE); - start_lsn = contiguous_lsn; - - do { + /* When copying the last part of the log, retry a few times to + ensure that all log up to the last checkpoint will be read. */ + for (unsigned retries = is_last ? 3 : 0;;) { end_lsn = start_lsn + RECV_SCAN_SIZE; xtrabackup_io_throttling(); log_mutex_enter(); - log_group_read_log_seg(LOG_RECOVER, log_sys->buf, - &log_sys->log, start_lsn, end_lsn); + lsn_t lsn = log_group_read_log_seg(log_sys->buf, &log_sys->log, + start_lsn, end_lsn); - bool success = xtrabackup_scan_log_recs( - &log_sys->log, is_last, - start_lsn, &contiguous_lsn, - &log_sys->log.scanned_lsn, - &finished); + start_lsn = xtrabackup_copy_log(is_last, start_lsn, lsn); log_mutex_exit(); - if (!success) { + if (!start_lsn) { ds_close(dst_log_file); + dst_log_file = NULL; msg("xtrabackup: Error: xtrabackup_copy_logfile()" " failed.\n"); - return(TRUE); + return(true); } - start_lsn = end_lsn; - } while (!finished); + if (start_lsn == end_lsn) { + /* All RECV_SCAN_SIZE bytes that were read + were valid redo log. Proceed to read more. */ + } else if (start_lsn & (OS_FILE_LOG_BLOCK_SIZE - 1)) { + /* The end of the log was encountered. */ + ut_ad(is_last); + break; + } else if (retries--) { + /* Retry copying the last log segment. */ + ut_ad(is_last); + os_thread_sleep(xtrabackup_log_copy_interval * 1000); + } else { + break; + } + } - msg_ts(">> log scanned up to (" LSN_PF ")\n", - log_sys->log.scanned_lsn); + ut_ad(start_lsn == log_sys->log.scanned_lsn); + + msg_ts(">> log scanned up to (" LSN_PF ")\n", start_lsn); /* update global variable*/ - log_copy_scanned_lsn = log_sys->log.scanned_lsn; + log_copy_scanned_lsn = start_lsn; debug_sync_point("xtrabackup_copy_logfile_pause"); - return(FALSE); + return(false); } static @@ -2677,8 +2359,7 @@ void* #else ulint #endif -log_copying_thread( - void* arg __attribute__((unused))) +log_copying_thread(void*) { /* Initialize mysys thread-specific memory so we can @@ -2686,31 +2367,17 @@ log_copying_thread( */ my_thread_init(); - ut_a(dst_log_file != NULL); - - log_copying_running = TRUE; - - while(log_copying) { + while (log_copying) { os_event_reset(log_copying_stop); os_event_wait_time_low(log_copying_stop, xtrabackup_log_copy_interval * 1000ULL, 0); - if (log_copying) { - if(xtrabackup_copy_logfile(log_copy_scanned_lsn, - FALSE)) { - - exit(EXIT_FAILURE); - } + if (log_copying && xtrabackup_copy_logfile(false)) { + break; } } - /* last copying */ - if(xtrabackup_copy_logfile(log_copy_scanned_lsn, TRUE)) { - - exit(EXIT_FAILURE); - } - - log_copying_running = FALSE; + log_copying_running = false; my_thread_end(); os_thread_exit(NULL); @@ -2724,15 +2391,11 @@ void* #else ulint #endif -io_watching_thread( - void* arg) +io_watching_thread(void*) { - (void)arg; /* currently, for --backup only */ ut_a(xtrabackup_backup); - io_watching_thread_running = TRUE; - while (log_copying) { os_thread_sleep(1000000); /*1 sec*/ io_ticket = xtrabackup_throttle; @@ -2743,49 +2406,13 @@ io_watching_thread( xtrabackup_throttle = 0; os_event_set(wait_throttle); - io_watching_thread_running = FALSE; + io_watching_thread_running = false; os_thread_exit(NULL); return(0); } -/************************************************************************ -I/o-handler thread function. */ -static - -#ifndef __WIN__ -void* -#else -ulint -#endif -io_handler_thread( -/*==============*/ - void* arg) -{ - ulint segment; - - - segment = *((ulint*)arg); - - while (srv_shutdown_state != SRV_SHUTDOWN_EXIT_THREADS) { - fil_aio_wait(segment); - } - - /* We count the number of threads in os_thread_exit(). A created - thread should always use that to exit and not use return() to exit. - The thread actually never comes here because it is exited in an - os_event_wait(). */ - - os_thread_exit(NULL); - -#ifndef __WIN__ - return(NULL); /* Not reached */ -#else - return(0); -#endif -} - /************************************************************************** Datafiles copying thread.*/ static @@ -2816,9 +2443,9 @@ data_copy_thread_func( } } - os_mutex_enter(ctxt->count_mutex); + pthread_mutex_lock(&ctxt->count_mutex); (*ctxt->count)--; - os_mutex_exit(ctxt->count_mutex); + pthread_mutex_unlock(&ctxt->count_mutex); my_thread_end(); os_thread_exit(NULL); @@ -2831,7 +2458,7 @@ Initialize the appropriate datasink(s). Both local backups and streaming in the Otherwise (i.e. when streaming in the 'tar' format) we need 2 separate datasinks for the data stream (and don't allow parallel data copying) and for metainfo -files (including xtrabackup_logfile). The second datasink writes to temporary +files (including ib_logfile0). The second datasink writes to temporary files first, and then streams them in a serialized way when closed. */ static void xtrabackup_init_datasinks(void) @@ -2917,43 +2544,263 @@ static void xtrabackup_destroy_datasinks(void) ds_redo = NULL; } -#define SRV_N_PENDING_IOS_PER_THREAD OS_AIO_N_PENDING_IOS_PER_THREAD #define SRV_MAX_N_PENDING_SYNC_IOS 100 -/************************************************************************ -@return TRUE if table should be opened. */ -static -ibool -xb_check_if_open_tablespace( - const char* db, - const char* table) -{ - char buf[FN_REFLEN]; - - snprintf(buf, sizeof(buf), "%s/%s", db, table); - - return !check_if_skip_table(buf); -} - -/************************************************************************ -Initializes the I/O and tablespace cache subsystems. */ +/** Initialize the tablespace cache subsystem. */ static void -xb_fil_io_init(void) -/*================*/ +xb_fil_io_init() { - srv_n_file_io_threads = srv_n_read_io_threads; - - os_aio_init(8 * SRV_N_PENDING_IOS_PER_THREAD, - srv_n_read_io_threads, - srv_n_write_io_threads, - SRV_MAX_N_PENDING_SYNC_IOS); - fil_init(srv_file_per_table ? 50000 : 5000, LONG_MAX); - fsp_init(); } +static +Datafile* +xb_new_datafile(const char *name, bool is_remote) +{ + if (is_remote) { + RemoteDatafile *remote_file = new RemoteDatafile(); + remote_file->set_name(name); + return(remote_file); + } else { + Datafile *file = new Datafile(); + file->set_name(name); + file->make_filepath(".", name, IBD); + return(file); + } +} + +static +void +xb_load_single_table_tablespace( + const char *dirname, + const char *filname, + bool is_remote) +{ + /* Ignore .isl files on XtraBackup recovery. All tablespaces must be + local. */ + if (is_remote && srv_operation == SRV_OPERATION_RESTORE) { + return; + } + if (check_if_skip_table(filname)) { + return; + } + + /* The name ends in .ibd or .isl; + try opening the file */ + char* name; + size_t dirlen = dirname == NULL ? 0 : strlen(dirname); + size_t namelen = strlen(filname); + ulint pathlen = dirname == NULL ? namelen + 1: dirlen + namelen + 2; + lsn_t flush_lsn; + dberr_t err; + fil_space_t *space; + + name = static_cast(ut_malloc_nokey(pathlen)); + + if (dirname != NULL) { + ut_snprintf(name, pathlen, "%s/%s", dirname, filname); + name[pathlen - 5] = 0; + } else { + ut_snprintf(name, pathlen, "%s", filname); + name[pathlen - 5] = 0; + } + + Datafile *file = xb_new_datafile(name, is_remote); + + if (file->open_read_only(true) != DB_SUCCESS) { + ut_free(name); + exit(EXIT_FAILURE); + } + + err = file->validate_first_page(&flush_lsn); + + if (err == DB_SUCCESS && file->space_id() != SRV_TMP_SPACE_ID) { + os_offset_t node_size = os_file_get_size(file->handle()); + os_offset_t n_pages; + + ut_a(node_size != (os_offset_t) -1); + + n_pages = node_size / page_size_t(file->flags()).physical(); + + space = fil_space_create( + name, file->space_id(), file->flags(), + FIL_TYPE_TABLESPACE, NULL/* TODO: crypt_data */); + + ut_a(space != NULL); + + if (!fil_node_create(file->filepath(), n_pages, space, + false, false)) { + ut_error; + } + + /* by opening the tablespace we forcing node and space objects + in the cache to be populated with fields from space header */ + fil_space_open(space->name); + + if (srv_operation == SRV_OPERATION_RESTORE || xb_close_files) { + fil_space_close(space->name); + } + } + + ut_free(name); + + if (fil_space_crypt_t* crypt_info = file->get_crypt_info()) { + fil_space_destroy_crypt_data(&crypt_info); + } + + delete file; + + if (err != DB_SUCCESS && err != DB_CORRUPTION && xtrabackup_backup) { + /* allow corrupted first page for xtrabackup, it could be just + zero-filled page, which we restore from redo log later */ + exit(EXIT_FAILURE); + } +} + +/** Scan the database directories under the MySQL datadir, looking for +.ibd files and determining the space id in each of them. +@return DB_SUCCESS or error number */ +static +dberr_t +xb_load_single_table_tablespaces() +{ + int ret; + char* dbpath = NULL; + ulint dbpath_len = 100; + os_file_dir_t dir; + os_file_dir_t dbdir; + os_file_stat_t dbinfo; + os_file_stat_t fileinfo; + dberr_t err = DB_SUCCESS; + + /* The datadir of MySQL is always the default directory of mysqld */ + + dir = os_file_opendir(fil_path_to_mysql_datadir, true); + + if (dir == NULL) { + + return(DB_ERROR); + } + + dbpath = static_cast(ut_malloc_nokey(dbpath_len)); + + /* Scan all directories under the datadir. They are the database + directories of MySQL. */ + + ret = fil_file_readdir_next_file(&err, fil_path_to_mysql_datadir, dir, + &dbinfo); + while (ret == 0) { + size_t len = strlen(dbinfo.name); + + /* General tablespaces are always at the first level of the + data home dir */ + if (dbinfo.type == OS_FILE_TYPE_FILE && len > 4) { + bool is_isl = !strcmp(dbinfo.name + len - 4, ".isl"); + bool is_ibd = !is_isl + && !strcmp(dbinfo.name + len - 4, ".ibd"); + + if (is_isl || is_ibd) { + xb_load_single_table_tablespace( + NULL, dbinfo.name, is_isl); + } + } + + if (dbinfo.type == OS_FILE_TYPE_FILE + || dbinfo.type == OS_FILE_TYPE_UNKNOWN) { + + goto next_datadir_item; + } + + /* We found a symlink or a directory; try opening it to see + if a symlink is a directory */ + + len = strlen(fil_path_to_mysql_datadir) + + strlen (dbinfo.name) + 2; + if (len > dbpath_len) { + dbpath_len = len; + + if (dbpath) { + ut_free(dbpath); + } + + dbpath = static_cast(ut_malloc_nokey(dbpath_len)); + } + ut_snprintf(dbpath, dbpath_len, + "%s/%s", fil_path_to_mysql_datadir, dbinfo.name); + os_normalize_path(dbpath); + + if (check_if_skip_database_by_path(dbpath)) { + fprintf(stderr, "Skipping db: %s\n", dbpath); + goto next_datadir_item; + } + + /* We want wrong directory permissions to be a fatal error for + XtraBackup. */ + dbdir = os_file_opendir(dbpath, true); + + if (dbdir != NULL) { + + /* We found a database directory; loop through it, + looking for possible .ibd files in it */ + + for (ret = fil_file_readdir_next_file(&err, dbpath, + dbdir, + &fileinfo); + ret == 0; + ret = fil_file_readdir_next_file(&err, dbpath, + dbdir, + &fileinfo)) { + if (fileinfo.type == OS_FILE_TYPE_DIR) { + continue; + } + + size_t len = strlen(fileinfo.name); + + /* We found a symlink or a file */ + if (len > 4 + && !strcmp(fileinfo.name + len - 4, + ".ibd")) { + xb_load_single_table_tablespace( + dbinfo.name, fileinfo.name, + false); + } + } + + if (0 != os_file_closedir(dbdir)) { + fprintf(stderr, "InnoDB: Warning: could not" + " close database directory %s\n", + dbpath); + + err = DB_ERROR; + } + + } else { + + err = DB_ERROR; + break; + + } + +next_datadir_item: + ret = fil_file_readdir_next_file(&err, + fil_path_to_mysql_datadir, + dir, &dbinfo); + } + + ut_free(dbpath); + + if (0 != os_file_closedir(dir)) { + fprintf(stderr, + "InnoDB: Error: could not close MySQL datadir\n"); + + return(DB_ERROR); + } + + return(err); +} + /**************************************************************************** Populates the tablespace memory cache by scanning for and opening data files. @returns DB_SUCCESS or error code.*/ @@ -2961,25 +2808,26 @@ static dberr_t xb_load_tablespaces() { - ulint i; bool create_new_db; dberr_t err; ulint sum_of_new_sizes; - lsn_t min_arch_logno, max_arch_logno; + lsn_t flush_lsn; - for (i = 0; i < srv_n_file_io_threads; i++) { - thread_nr[i] = i; + ut_ad(srv_operation == SRV_OPERATION_BACKUP + || srv_operation == SRV_OPERATION_RESTORE); - os_thread_create(io_handler_thread, thread_nr + i, - thread_ids + i); - } + err = srv_sys_space.check_file_spec(&create_new_db, 0); - os_thread_sleep(200000); /*0.2 sec*/ + /* create_new_db must not be true. */ + if (err != DB_SUCCESS || create_new_db) { + msg("xtrabackup: could not find data files at the " + "specified datadir\n"); + return(DB_ERROR); + } + + err = srv_sys_space.open_or_create(false, false, &sum_of_new_sizes, + &flush_lsn); - err = open_or_create_data_files(&create_new_db, - &min_arch_logno, &max_arch_logno, - &flushed_lsn, - &sum_of_new_sizes); if (err != DB_SUCCESS) { msg("xtrabackup: Could not open or create data files.\n" "xtrabackup: If you tried to add new data files, and it " @@ -2997,30 +2845,21 @@ xb_load_tablespaces() return(err); } - /* create_new_db must not be TRUE.. */ - if (create_new_db) { - msg("xtrabackup: could not find data files at the " - "specified datadir\n"); - return(DB_ERROR); - } - /* Add separate undo tablespaces to fil_system */ - err = srv_undo_tablespaces_init(FALSE, - TRUE, - srv_undo_tablespaces, - &srv_undo_tablespaces_open); + err = srv_undo_tablespaces_init(false); + if (err != DB_SUCCESS) { return(err); } - /* It is important to call fil_load_single_table_tablespace() after + /* It is important to call xb_load_single_table_tablespaces() after srv_undo_tablespaces_init(), because fil_is_user_tablespace_id() * relies on srv_undo_tablespaces_open to be properly initialized */ msg("xtrabackup: Generating a list of tablespaces\n"); - err = fil_load_single_table_tablespaces(xb_check_if_open_tablespace); + err = xb_load_single_table_tablespaces(); if (err != DB_SUCCESS) { return(err); } @@ -3049,42 +2888,11 @@ static void xb_data_files_close() { - ulint i; - - /* Shutdown the aio threads. This has been copied from - innobase_shutdown_for_mysql(). */ - - srv_shutdown_state = SRV_SHUTDOWN_EXIT_THREADS; - - for (i = 0; i < 1000; i++) { - os_aio_wake_all_threads_at_shutdown(); - - if (os_thread_count == 0) { - break; - } - os_thread_sleep(10000); - } - - if (i == 1000) { - msg("xtrabackup: Warning: %lu threads created by InnoDB" - " had not exited at shutdown!\n", - (ulong) os_thread_count); - } - - os_aio_free(); - + ut_ad(!os_thread_count); fil_close_all_files(); - - /* Free the double write data structures. */ if (buf_dblwr) { buf_dblwr_free(); } - - /* Reset srv_file_io_threads to its default value to avoid confusing - warning on --prepare in innobase_start_or_create_for_mysql()*/ - srv_n_file_io_threads = 4; - - srv_shutdown_state = SRV_SHUTDOWN_NONE; } /*********************************************************************** @@ -3103,7 +2911,7 @@ xb_new_filter_entry( ut_a(namelen <= NAME_LEN * 2 + 1); entry = static_cast - (ut_malloc(sizeof(xb_filter_entry_t) + namelen + 1)); + (malloc(sizeof(xb_filter_entry_t) + namelen + 1)); memset(entry, '\0', sizeof(xb_filter_entry_t) + namelen + 1); entry->name = ((char*)entry) + sizeof(xb_filter_entry_t); strcpy(entry->name, name); @@ -3402,7 +3210,7 @@ xb_filter_hash_free(hash_table_t* hash) HASH_DELETE(xb_filter_entry_t, name_hash, hash, ut_fold_string(prev_table->name), prev_table); - ut_free(prev_table); + free(prev_table); } } @@ -3451,77 +3259,33 @@ static ulint open_or_create_log_file( /*====================*/ - ibool create_new_db, /*!< in: TRUE if we should create a - new database */ + fil_space_t* space, ibool* log_file_created, /*!< out: TRUE if new log file created */ - ibool log_file_has_been_opened,/*!< in: TRUE if a log file has been - opened before: then it is an error - to try to create another log file */ ulint i) /*!< in: log file number in group */ { - ibool ret; - os_offset_t size; char name[10000]; ulint dirnamelen; - UT_NOT_USED(create_new_db); - UT_NOT_USED(log_file_has_been_opened); - *log_file_created = FALSE; - srv_normalize_path_for_win(srv_log_group_home_dir); + os_normalize_path(srv_log_group_home_dir); dirnamelen = strlen(srv_log_group_home_dir); ut_a(dirnamelen < (sizeof name) - 10 - sizeof "ib_logfile"); memcpy(name, srv_log_group_home_dir, dirnamelen); /* Add a path separator if needed. */ - if (dirnamelen && name[dirnamelen - 1] != SRV_PATH_SEPARATOR) { - name[dirnamelen++] = SRV_PATH_SEPARATOR; + if (dirnamelen && name[dirnamelen - 1] != OS_PATH_SEPARATOR) { + name[dirnamelen++] = OS_PATH_SEPARATOR; } sprintf(name + dirnamelen, "%s%lu", "ib_logfile", (ulong) i); - files[i] = os_file_create(innodb_file_log_key, name, - OS_FILE_OPEN, OS_FILE_NORMAL, - OS_LOG_FILE, &ret,0); - if (ret == FALSE) { - fprintf(stderr, "InnoDB: Error in opening %s\n", name); - - return(DB_ERROR); - } - - size = os_file_get_size(files[i]); - - if (size != srv_log_file_size * UNIV_PAGE_SIZE) { - - fprintf(stderr, - "InnoDB: Error: log file %s is" - " of different size " UINT64PF " bytes\n" - "InnoDB: than specified in the .cnf" - " file " UINT64PF " bytes!\n", - name, size, srv_log_file_size * UNIV_PAGE_SIZE); - - return(DB_ERROR); - } - - ret = os_file_close(files[i]); - ut_a(ret); - - if (i == 0) { - /* Create in memory the file space object - which is for this log group */ - - fil_space_create(name, - SRV_LOG_SPACE_FIRST_ID, 0, FIL_TYPE_LOG, 0, 0); - log_init(srv_n_log_files, srv_log_file_size * UNIV_PAGE_SIZE); - } - ut_a(fil_validate()); - ut_a(fil_node_create(name, (ulint)srv_log_file_size, - SRV_LOG_SPACE_FIRST_ID, FALSE)); + ut_a(fil_node_create(name, srv_log_file_size >> srv_page_size_shift, + space, false, false)); return(DB_SUCCESS); } @@ -3534,20 +3298,8 @@ void xb_normalize_init_values(void) /*==========================*/ { - ulint i; - - for (i = 0; i < srv_n_data_files; i++) { - srv_data_file_sizes[i] = srv_data_file_sizes[i] - * ((1024 * 1024) / UNIV_PAGE_SIZE); - } - - srv_last_file_size_max = srv_last_file_size_max - * ((1024 * 1024) / UNIV_PAGE_SIZE); - - srv_log_file_size = srv_log_file_size / UNIV_PAGE_SIZE; - - srv_log_buffer_size = srv_log_buffer_size / UNIV_PAGE_SIZE; - + srv_sys_space.normalize(); + srv_log_buffer_size /= UNIV_PAGE_SIZE; srv_lock_table_size = 5 * (srv_buf_pool_size / UNIV_PAGE_SIZE); } @@ -3608,8 +3360,11 @@ end: #endif } -void -xtrabackup_backup_func(void) +/** Implement --backup +@return whether the operation succeeded */ +static +bool +xtrabackup_backup_func() { MY_STAT stat_info; lsn_t latest_cp; @@ -3627,7 +3382,7 @@ xtrabackup_backup_func(void) if (my_setwd(mysql_real_data_home,MYF(MY_WME))) { msg("xtrabackup: cannot my_setwd %s\n", mysql_real_data_home); - exit(EXIT_FAILURE); + return(false); } msg("xtrabackup: cd to %s\n", mysql_real_data_home); @@ -3642,49 +3397,50 @@ xtrabackup_backup_func(void) srv_n_purge_threads = 1; srv_read_only_mode = TRUE; - srv_backup_mode = TRUE; - srv_close_files = (bool)xb_close_files; + srv_operation = SRV_OPERATION_BACKUP; - if (srv_close_files) + if (xb_close_files) msg("xtrabackup: warning: close-files specified. Use it " "at your own risk. If there are DDL operations like table DROP TABLE " "or RENAME TABLE during the backup, inconsistent backup will be " "produced.\n"); /* initialize components */ - if(innodb_init_param()) - exit(EXIT_FAILURE); + if(innodb_init_param()) { +fail: + innodb_shutdown(); + return(false); + } xb_normalize_init_values(); if (srv_file_flush_method_str == NULL) { - /* These are the default options */ - srv_unix_file_flush_method = SRV_UNIX_FSYNC; + /* These are the default options */ + srv_file_flush_method = SRV_FSYNC; } else if (0 == ut_strcmp(srv_file_flush_method_str, "fsync")) { - srv_unix_file_flush_method = SRV_UNIX_FSYNC; + srv_file_flush_method = SRV_FSYNC; } else if (0 == ut_strcmp(srv_file_flush_method_str, "O_DSYNC")) { - srv_unix_file_flush_method = SRV_UNIX_O_DSYNC; + srv_file_flush_method = SRV_O_DSYNC; } else if (0 == ut_strcmp(srv_file_flush_method_str, "O_DIRECT")) { - srv_unix_file_flush_method = SRV_UNIX_O_DIRECT; + srv_file_flush_method = SRV_O_DIRECT; msg("xtrabackup: using O_DIRECT\n"); } else if (0 == ut_strcmp(srv_file_flush_method_str, "littlesync")) { - srv_unix_file_flush_method = SRV_UNIX_LITTLESYNC; - + srv_file_flush_method = SRV_LITTLESYNC; } else if (0 == ut_strcmp(srv_file_flush_method_str, "nosync")) { - srv_unix_file_flush_method = SRV_UNIX_NOSYNC; + srv_file_flush_method = SRV_NOSYNC; } else if (0 == ut_strcmp(srv_file_flush_method_str, "ALL_O_DIRECT")) { - srv_unix_file_flush_method = SRV_UNIX_ALL_O_DIRECT; + srv_file_flush_method = SRV_ALL_O_DIRECT_FSYNC; msg("xtrabackup: using ALL_O_DIRECT\n"); } else if (0 == ut_strcmp(srv_file_flush_method_str, "O_DIRECT_NO_FSYNC")) { - srv_unix_file_flush_method = SRV_UNIX_O_DIRECT_NO_FSYNC; + srv_file_flush_method = SRV_O_DIRECT_NO_FSYNC; msg("xtrabackup: using O_DIRECT_NO_FSYNC\n"); } else { - msg("xtrabackup: Unrecognized value %s for " + msg("xtrabackup: Unrecognized value %s for " "innodb_flush_method\n", srv_file_flush_method_str); - exit(EXIT_FAILURE); + goto fail; } /* We can only use synchronous unbuffered IO on Windows for now */ @@ -3694,8 +3450,8 @@ xtrabackup_backup_func(void) } #ifdef _WIN32 - srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED; - srv_use_native_aio = FALSE; + srv_file_flush_method = SRV_ALL_O_DIRECT_FSYNC; + srv_use_native_aio = TRUE; #endif if (srv_buf_pool_size >= 1000 * 1024 * 1024) { @@ -3715,12 +3471,19 @@ xtrabackup_backup_func(void) computers */ } - srv_general_init(); + sync_check_init(); + ut_d(sync_check_enable()); + /* Reset the system variables in the recovery module. */ + recv_sys_var_init(); + trx_pool_init(); + row_mysql_init(); + ut_crc32_init(); crc_init(); + recv_sys_init(); #ifdef WITH_INNODB_DISALLOW_WRITES - srv_allow_writes_event = os_event_create(); + srv_allow_writes_event = os_event_create(0); os_event_set(srv_allow_writes_event); #endif @@ -3734,18 +3497,23 @@ xtrabackup_backup_func(void) ulint i; xb_fil_io_init(); + srv_n_file_io_threads = srv_n_read_io_threads; + + os_aio_init(srv_n_read_io_threads, srv_n_write_io_threads, + SRV_MAX_N_PENDING_SYNC_IOS); log_sys_init(); + log_init(srv_n_log_files); + fil_space_t* space = fil_space_create( + "innodb_redo_log", SRV_LOG_SPACE_FIRST_ID, 0, + FIL_TYPE_LOG, NULL); lock_sys_create(srv_lock_table_size); for (i = 0; i < srv_n_log_files; i++) { - err = open_or_create_log_file(FALSE, &log_file_created, - log_opened, i); + err = open_or_create_log_file(space, &log_file_created, i); if (err != DB_SUCCESS) { - - //return((int) err); - exit(EXIT_FAILURE); + goto fail; } if (log_file_created) { @@ -3762,15 +3530,14 @@ xtrabackup_backup_func(void) "xtrabackup: Then delete the existing log files. Edit the .cnf file\n" "xtrabackup: and start the database again.\n"); - //return(DB_ERROR); - exit(EXIT_FAILURE); + goto fail; } } /* log_file_created must not be TRUE, if online */ if (log_file_created) { msg("xtrabackup: Something wrong with source files...\n"); - exit(EXIT_FAILURE); + goto fail; } } @@ -3781,7 +3548,7 @@ xtrabackup_backup_func(void) && (my_mkdir(xtrabackup_extra_lsndir,0777,MYF(0)) < 0)) { msg("xtrabackup: Error: cannot mkdir %d: %s\n", my_errno, xtrabackup_extra_lsndir); - exit(EXIT_FAILURE); + goto fail; } /* create target dir if not exist */ @@ -3789,12 +3556,10 @@ xtrabackup_backup_func(void) && (my_mkdir(xtrabackup_target_dir,0777,MYF(0)) < 0)){ msg("xtrabackup: Error: cannot mkdir %d: %s\n", my_errno, xtrabackup_target_dir); - exit(EXIT_FAILURE); + goto fail; } { - fil_system_t* f_system = fil_system; - /* definition from recv_recovery_from_checkpoint_start() */ ulint max_cp_field; @@ -3810,14 +3575,17 @@ xtrabackup_backup_func(void) dberr_t err = recv_find_max_checkpoint(&max_cp_field); if (err != DB_SUCCESS) { - exit(EXIT_FAILURE); +log_fail: + log_mutex_exit(); + goto fail; } if (log_sys->log.format == 0) { old_format: msg("xtrabackup: Error: cannot process redo log" " before MariaDB 10.2.2\n"); - exit(EXIT_FAILURE); + log_mutex_exit(); + goto log_fail; } ut_ad(!((log_sys->log.format ^ LOG_HEADER_FORMAT_CURRENT) @@ -3832,7 +3600,7 @@ reread_log_header: err = recv_find_max_checkpoint(&max_cp_field); if (err != DB_SUCCESS) { - exit(EXIT_FAILURE); + goto log_fail; } if (log_sys->log.format == 0) { @@ -3842,7 +3610,7 @@ reread_log_header: ut_ad(!((log_sys->log.format ^ LOG_HEADER_FORMAT_CURRENT) & ~LOG_HEADER_FORMAT_ENCRYPTED)); - if(checkpoint_no_start != mach_read_from_8(buf + LOG_CHECKPOINT_NO)) { + if (checkpoint_no_start != mach_read_from_8(buf + LOG_CHECKPOINT_NO)) { checkpoint_lsn_start = mach_read_from_8(buf + LOG_CHECKPOINT_LSN); checkpoint_no_start = mach_read_from_8(buf + LOG_CHECKPOINT_NO); @@ -3854,33 +3622,49 @@ reread_log_header: xtrabackup_init_datasinks(); if (!select_history()) { - exit(EXIT_FAILURE); + goto fail; } /* open the log file */ memset(&stat_info, 0, sizeof(MY_STAT)); - dst_log_file = ds_open(ds_redo, XB_LOG_FILENAME, &stat_info); + dst_log_file = ds_open(ds_redo, "ib_logfile0", &stat_info); if (dst_log_file == NULL) { msg("xtrabackup: error: failed to open the target stream for " - "'%s'.\n", XB_LOG_FILENAME); - ut_free(log_hdr_buf_); - exit(EXIT_FAILURE); + "'ib_logfile0'.\n"); + goto fail; } /* label it */ - strcpy((char*) log_hdr_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP, - "xtrabkup "); - ut_sprintf_timestamp( - (char*) log_hdr_buf + (LOG_FILE_WAS_CREATED_BY_HOT_BACKUP - + (sizeof "xtrabkup ") - 1)); + byte MY_ALIGNED(OS_FILE_LOG_BLOCK_SIZE) log_hdr[OS_FILE_LOG_BLOCK_SIZE]; + memset(log_hdr, 0, sizeof log_hdr); + mach_write_to_4(LOG_HEADER_FORMAT + log_hdr, log_sys->log.format); + mach_write_to_8(LOG_HEADER_START_LSN + log_hdr, checkpoint_lsn_start); + strcpy(reinterpret_cast(LOG_HEADER_CREATOR + log_hdr), + "Backup " MYSQL_SERVER_VERSION); + log_block_set_checksum(log_hdr, + log_block_calc_checksum_crc32(log_hdr)); - if (ds_write(dst_log_file, log_hdr_buf, LOG_FILE_HDR_SIZE)) { + /* Write the log header. */ + if (ds_write(dst_log_file, log_hdr, sizeof log_hdr)) { + log_write_fail: msg("xtrabackup: error: write to logfile failed\n"); - ut_free(log_hdr_buf_); - exit(EXIT_FAILURE); + goto fail; + } + /* Adjust the checkpoint page. */ + memcpy(log_hdr, buf, OS_FILE_LOG_BLOCK_SIZE); + mach_write_to_8(log_hdr + LOG_CHECKPOINT_OFFSET, + (checkpoint_lsn_start & (OS_FILE_LOG_BLOCK_SIZE - 1)) + | LOG_FILE_HDR_SIZE); + log_block_set_checksum(log_hdr, + log_block_calc_checksum_crc32(log_hdr)); + /* Write checkpoint page 1 and two empty log pages before the + payload. */ + if (ds_write(dst_log_file, log_hdr, OS_FILE_LOG_BLOCK_SIZE) + || !memset(log_hdr, 0, sizeof log_hdr) + || ds_write(dst_log_file, log_hdr, sizeof log_hdr) + || ds_write(dst_log_file, log_hdr, sizeof log_hdr)) { + goto log_write_fail; } - - ut_free(log_hdr_buf_); /* start flag */ log_copying = TRUE; @@ -3890,18 +3674,20 @@ reread_log_header: os_thread_id_t io_watching_thread_id; io_ticket = xtrabackup_throttle; - wait_throttle = os_event_create(); + wait_throttle = os_event_create(0); + io_watching_thread_running = true; os_thread_create(io_watching_thread, NULL, &io_watching_thread_id); } /* copy log file by current position */ - if(xtrabackup_copy_logfile(checkpoint_lsn_start, FALSE)) - exit(EXIT_FAILURE); + log_copy_scanned_lsn = checkpoint_lsn_start; + if (xtrabackup_copy_logfile(false)) + goto fail; - - log_copying_stop = os_event_create(); + log_copying_stop = os_event_create(0); + log_copying_running = true; os_thread_create(log_copying_thread, NULL, &log_copying_thread_id); /* Populate fil_system with tablespaces to copy */ @@ -3909,12 +3695,12 @@ reread_log_header: if (err != DB_SUCCESS) { msg("xtrabackup: error: xb_load_tablespaces() failed with" "error code %u\n", err); - exit(EXIT_FAILURE); + goto fail; } /* FLUSH CHANGED_PAGE_BITMAPS call */ if (!flush_changed_page_bitmaps()) { - exit(EXIT_FAILURE); + goto fail; } debug_sync_point("xtrabackup_suspend_at_start"); @@ -3939,17 +3725,17 @@ reread_log_header: "files transfer\n", xtrabackup_parallel); } - it = datafiles_iter_new(f_system); + it = datafiles_iter_new(fil_system); if (it == NULL) { msg("xtrabackup: Error: datafiles_iter_new() failed.\n"); - exit(EXIT_FAILURE); + goto fail; } /* Create data copying threads */ data_threads = (data_thread_ctxt_t *) - ut_malloc(sizeof(data_thread_ctxt_t) * xtrabackup_parallel); + malloc(sizeof(data_thread_ctxt_t) * xtrabackup_parallel); count = xtrabackup_parallel; - count_mutex = os_mutex_create(); + pthread_mutex_init(&count_mutex, NULL); for (i = 0; i < (uint) xtrabackup_parallel; i++) { data_threads[i].it = it; @@ -3963,16 +3749,16 @@ reread_log_header: /* Wait for threads to exit */ while (1) { os_thread_sleep(1000000); - os_mutex_enter(count_mutex); - if (count == 0) { - os_mutex_exit(count_mutex); + pthread_mutex_lock(&count_mutex); + bool stop = count == 0; + pthread_mutex_unlock(&count_mutex); + if (stop) { break; } - os_mutex_exit(count_mutex); } - os_mutex_free(count_mutex); - ut_free(data_threads); + pthread_mutex_destroy(&count_mutex); + free(data_threads); datafiles_iter_free(it); if (changed_page_bitmap) { @@ -3981,7 +3767,7 @@ reread_log_header: } if (!backup_start()) { - exit(EXIT_FAILURE); + goto fail; } /* read the latest checkpoint lsn */ @@ -4013,11 +3799,19 @@ reread_log_header: } msg("\n"); - os_event_free(log_copying_stop); - if (ds_close(dst_log_file)) { - exit(EXIT_FAILURE); + os_event_destroy(log_copying_stop); + + if (!dst_log_file || xtrabackup_copy_logfile(true)) { + goto fail; } + if (ds_close(dst_log_file)) { + dst_log_file = NULL; + goto fail; + } + + dst_log_file = NULL; + if(!xtrabackup_incremental) { strcpy(metadata_type, "full-backuped"); metadata_from_lsn = 0; @@ -4030,7 +3824,7 @@ reread_log_header: if (!xtrabackup_stream_metadata(ds_meta)) { msg("xtrabackup: Error: failed to stream metadata.\n"); - exit(EXIT_FAILURE); + goto fail; } if (xtrabackup_extra_lsndir) { char filename[FN_REFLEN]; @@ -4040,13 +3834,13 @@ reread_log_header: if (!xtrabackup_write_metadata(filename)) { msg("xtrabackup: Error: failed to write metadata " "to '%s'.\n", filename); - exit(EXIT_FAILURE); + goto fail; } } if (!backup_finish()) { - exit(EXIT_FAILURE); + goto fail; } xtrabackup_destroy_datasinks(); @@ -4056,319 +3850,29 @@ reread_log_header: while (io_watching_thread_running) { os_thread_sleep(1000000); } - os_event_free(wait_throttle); - wait_throttle = NULL; + os_event_destroy(wait_throttle); } - msg("xtrabackup: Transaction log of lsn (" LSN_PF ") to (" LSN_PF + msg("xtrabackup: Redo log (from LSN " LSN_PF " to " LSN_PF ") was copied.\n", checkpoint_lsn_start, log_copy_scanned_lsn); xb_filters_free(); xb_data_files_close(); - /* Make sure that the latest checkpoint made it to xtrabackup_logfile */ + /* Make sure that the latest checkpoint was included */ if (latest_cp > log_copy_scanned_lsn) { msg("xtrabackup: error: last checkpoint LSN (" LSN_PF ") is larger than last copied LSN (" LSN_PF ").\n", latest_cp, log_copy_scanned_lsn); - exit(EXIT_FAILURE); + goto fail; } + + innodb_shutdown(); + return(true); } /* ================= prepare ================= */ -static my_bool -xtrabackup_init_temp_log(void) -{ - pfs_os_file_t src_file; - char src_path[FN_REFLEN]; - char dst_path[FN_REFLEN]; - ibool success; - - ulint field; - byte* log_buf= (byte *)malloc(UNIV_PAGE_SIZE_MAX * 128); /* 2 MB */ - - ib_int64_t file_size; - - lsn_t max_no; - lsn_t max_lsn; - lsn_t checkpoint_no; - - ulint fold; - - bool checkpoint_found; - - max_no = 0; - - if (!log_buf) { - goto error; - } - - if (!xb_init_log_block_size()) { - goto error; - } - - if(!xtrabackup_incremental_dir) { - sprintf(dst_path, "%s/ib_logfile0", xtrabackup_target_dir); - sprintf(src_path, "%s/%s", xtrabackup_target_dir, - XB_LOG_FILENAME); - } else { - sprintf(dst_path, "%s/ib_logfile0", xtrabackup_incremental_dir); - sprintf(src_path, "%s/%s", xtrabackup_incremental_dir, - XB_LOG_FILENAME); - } - - srv_normalize_path_for_win(dst_path); - srv_normalize_path_for_win(src_path); -retry: - src_file = os_file_create_simple_no_error_handling(0, src_path, - OS_FILE_OPEN, - OS_FILE_READ_WRITE, - &success,0); - if (!success) { - /* The following call prints an error message */ - os_file_get_last_error(TRUE); - - msg("xtrabackup: Warning: cannot open %s. will try to find.\n", - src_path); - - /* check if ib_logfile0 may be xtrabackup_logfile */ - src_file = os_file_create_simple_no_error_handling(0, dst_path, - OS_FILE_OPEN, - OS_FILE_READ_WRITE, - &success,0); - if (!success) { - os_file_get_last_error(TRUE); - msg(" xtrabackup: Fatal error: cannot find %s.\n", - src_path); - - goto error; - } - - success = os_file_read(src_file, log_buf, 0, - LOG_FILE_HDR_SIZE); - if (!success) { - goto error; - } - - if ( ut_memcmp(log_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP, - (byte*)"xtrabkup", (sizeof "xtrabkup") - 1) == 0) { - msg(" xtrabackup: 'ib_logfile0' seems to be " - "'xtrabackup_logfile'. will retry.\n"); - - os_file_close(src_file); - src_file = XB_FILE_UNDEFINED; - - /* rename and try again */ - success = os_file_rename(0, dst_path, src_path); - if (!success) { - goto error; - } - - goto retry; - } - - msg(" xtrabackup: Fatal error: cannot find %s.\n", - src_path); - - os_file_close(src_file); - src_file = XB_FILE_UNDEFINED; - - goto error; - } - - file_size = os_file_get_size(src_file); - - - /* TODO: We should skip the following modifies, if it is not the first time. */ - - /* read log file header */ - success = os_file_read(src_file, log_buf, 0, LOG_FILE_HDR_SIZE); - if (!success) { - goto error; - } - - if ( ut_memcmp(log_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP, - (byte*)"xtrabkup", (sizeof "xtrabkup") - 1) != 0 ) { - msg("xtrabackup: notice: xtrabackup_logfile was already used " - "to '--prepare'.\n"); - goto skip_modify; - } else { - /* clear it later */ - //memset(log_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP, - // ' ', 4); - } - - checkpoint_found = false; - - /* read last checkpoint lsn */ - for (field = LOG_CHECKPOINT_1; field <= LOG_CHECKPOINT_2; - field += LOG_CHECKPOINT_2 - LOG_CHECKPOINT_1) { - if (!recv_check_cp_is_consistent(const_cast - (log_buf + field))) - goto not_consistent; - - checkpoint_no = mach_read_from_8(log_buf + field + - LOG_CHECKPOINT_NO); - - if (checkpoint_no >= max_no) { - - max_no = checkpoint_no; - max_lsn = mach_read_from_8(log_buf + field + - LOG_CHECKPOINT_LSN); - checkpoint_found = true; - } -not_consistent: - ; - } - - if (!checkpoint_found) { - msg("xtrabackup: No valid checkpoint found.\n"); - goto error; - } - - - /* It seems to be needed to overwrite the both checkpoint area. */ - mach_write_to_8(log_buf + LOG_CHECKPOINT_1 + LOG_CHECKPOINT_LSN, - max_lsn); - mach_write_to_4(log_buf + LOG_CHECKPOINT_1 - + LOG_CHECKPOINT_OFFSET_LOW32, - LOG_FILE_HDR_SIZE + - (ulint)(max_lsn - - ut_uint64_align_down(max_lsn, - OS_FILE_LOG_BLOCK_SIZE))); - mach_write_to_4(log_buf + LOG_CHECKPOINT_1 - + LOG_CHECKPOINT_OFFSET_HIGH32, 0); - fold = ut_fold_binary(log_buf + LOG_CHECKPOINT_1, LOG_CHECKPOINT_CHECKSUM_1); - mach_write_to_4(log_buf + LOG_CHECKPOINT_1 + LOG_CHECKPOINT_CHECKSUM_1, fold); - - fold = ut_fold_binary(log_buf + LOG_CHECKPOINT_1 + LOG_CHECKPOINT_LSN, - LOG_CHECKPOINT_CHECKSUM_2 - LOG_CHECKPOINT_LSN); - mach_write_to_4(log_buf + LOG_CHECKPOINT_1 + LOG_CHECKPOINT_CHECKSUM_2, fold); - - mach_write_to_8(log_buf + LOG_CHECKPOINT_2 + LOG_CHECKPOINT_LSN, - max_lsn); - mach_write_to_4(log_buf + LOG_CHECKPOINT_2 - + LOG_CHECKPOINT_OFFSET_LOW32, - LOG_FILE_HDR_SIZE + - (ulint)(max_lsn - - ut_uint64_align_down(max_lsn, - OS_FILE_LOG_BLOCK_SIZE))); - mach_write_to_4(log_buf + LOG_CHECKPOINT_2 - + LOG_CHECKPOINT_OFFSET_HIGH32, 0); - fold = ut_fold_binary(log_buf + LOG_CHECKPOINT_2, LOG_CHECKPOINT_CHECKSUM_1); - mach_write_to_4(log_buf + LOG_CHECKPOINT_2 + LOG_CHECKPOINT_CHECKSUM_1, fold); - - fold = ut_fold_binary(log_buf + LOG_CHECKPOINT_2 + LOG_CHECKPOINT_LSN, - LOG_CHECKPOINT_CHECKSUM_2 - LOG_CHECKPOINT_LSN); - mach_write_to_4(log_buf + LOG_CHECKPOINT_2 + LOG_CHECKPOINT_CHECKSUM_2, fold); - - - success = os_file_write(src_path, src_file, log_buf, 0, - LOG_FILE_HDR_SIZE); - if (!success) { - goto error; - } - - /* expand file size (9/8) and align to UNIV_PAGE_SIZE_MAX */ - - if (file_size % UNIV_PAGE_SIZE_MAX) { - memset(log_buf, 0, UNIV_PAGE_SIZE_MAX); - success = os_file_write(src_path, src_file, log_buf, - file_size, - UNIV_PAGE_SIZE_MAX - - (ulint) (file_size - % UNIV_PAGE_SIZE_MAX)); - if (!success) { - goto error; - } - - file_size = os_file_get_size(src_file); - } - - /* TODO: We should judge whether the file is already expanded or not... */ - { - ulint expand; - - memset(log_buf, 0, UNIV_PAGE_SIZE_MAX * 128); - expand = (ulint) (file_size / UNIV_PAGE_SIZE_MAX / 8); - - for (; expand > 128; expand -= 128) { - success = os_file_write(src_path, src_file, log_buf, - file_size, - UNIV_PAGE_SIZE_MAX * 128); - if (!success) { - goto error; - } - file_size += UNIV_PAGE_SIZE_MAX * 128; - } - - if (expand) { - success = os_file_write(src_path, src_file, log_buf, - file_size, - expand * UNIV_PAGE_SIZE_MAX); - if (!success) { - goto error; - } - file_size += UNIV_PAGE_SIZE_MAX * expand; - } - } - - /* make larger than 2MB */ - if (file_size < 2*1024*1024L) { - memset(log_buf, 0, UNIV_PAGE_SIZE_MAX); - while (file_size < 2*1024*1024L) { - success = os_file_write(src_path, src_file, log_buf, - file_size, - UNIV_PAGE_SIZE_MAX); - if (!success) { - goto error; - } - file_size += UNIV_PAGE_SIZE_MAX; - } - file_size = os_file_get_size(src_file); - } - - msg("xtrabackup: xtrabackup_logfile detected: size=" INT64PF ", " - "start_lsn=(" LSN_PF ")\n", file_size, max_lsn); - - os_file_close(src_file); - src_file = XB_FILE_UNDEFINED; - - /* fake InnoDB */ - innobase_log_files_in_group_save = innobase_log_files_in_group; - srv_log_group_home_dir_save = srv_log_group_home_dir; - innobase_log_file_size_save = innobase_log_file_size; - - srv_log_group_home_dir = NULL; - innobase_log_file_size = file_size; - innobase_log_files_in_group = 1; - - srv_thread_concurrency = 0; - - /* rename 'xtrabackup_logfile' to 'ib_logfile0' */ - success = os_file_rename(0, src_path, dst_path); - if (!success) { - goto error; - } - xtrabackup_logfile_is_renamed = TRUE; - free(log_buf); - return(FALSE); - -skip_modify: - free(log_buf); - os_file_close(src_file); - src_file = XB_FILE_UNDEFINED; - return(FALSE); - -error: - free(log_buf); - if (src_file != XB_FILE_UNDEFINED) - os_file_close(src_file); - msg("xtrabackup: Error: xtrabackup_init_temp_log() failed.\n"); - return(TRUE); /*ERROR*/ -} - /*********************************************************************** Generates path to the meta file path from a given path to an incremental .delta by replacing trailing ".delta" with ".meta", or returns error if 'delta_path' @@ -4398,31 +3902,30 @@ file. Code adopted from fil_create_new_single_table_tablespace with the main difference that only disk file is created without updating the InnoDB in-memory dictionary data structures. -@return TRUE on success, FALSE on error. */ +@return true on success, false on error. */ static -ibool +bool xb_space_create_file( /*==================*/ const char* path, /*!(ut_malloc(3 * UNIV_PAGE_SIZE)); + buf = static_cast(malloc(3 * UNIV_PAGE_SIZE)); /* Align the memory for file i/o if we might have O_DIRECT set */ page = static_cast(ut_align(buf, UNIV_PAGE_SIZE)); @@ -4439,19 +3942,19 @@ xb_space_create_file( fsp_header_init_fields(page, space_id, flags); mach_write_to_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID, space_id); - if (!fsp_flags_is_compressed(flags)) { - buf_flush_init_for_writing(page, NULL, 0); + const page_size_t page_size(flags); - ret = os_file_write(path, *file, page, 0, UNIV_PAGE_SIZE); - } - else { + if (!page_size.is_compressed()) { + buf_flush_init_for_writing(NULL, page, NULL, 0, false); + + ret = os_file_write(IORequestWrite, path, *file, page, 0, + UNIV_PAGE_SIZE); + } else { page_zip_des_t page_zip; - ulint zip_size; - - zip_size = fsp_flags_get_zip_size(flags); + ulint zip_size = page_size.physical(); page_zip_set_size(&page_zip, zip_size); page_zip.data = page + UNIV_PAGE_SIZE; - fprintf(stderr, "zip_size = %lu\n", zip_size); + fprintf(stderr, "zip_size = " ULINTPF "\n", zip_size); #ifdef UNIV_DEBUG page_zip.m_start = @@ -4459,13 +3962,13 @@ xb_space_create_file( page_zip.m_end = page_zip.m_nonempty = page_zip.n_blobs = 0; - buf_flush_init_for_writing(page, &page_zip, 0); + buf_flush_init_for_writing(NULL, page, &page_zip, 0, false); - ret = os_file_write(path, *file, page_zip.data, 0, - zip_size); + ret = os_file_write(IORequestWrite, path, *file, + page_zip.data, 0, zip_size); } - ut_free(buf); + free(buf); if (!ret) { msg("xtrabackup: could not write the first page to %s\n", @@ -4490,35 +3993,32 @@ pfs_os_file_t xb_delta_open_matching_space( const char* dbname, /* in: path to destination database dir */ const char* name, /* in: name of delta file (without .delta) */ - ulint space_id, /* in: space id of delta file */ - ulint zip_size, /* in: zip_size of tablespace */ + const xb_delta_info_t& info, char* real_name, /* out: full path of destination file */ size_t real_name_len, /* out: buffer size for real_name */ - ibool* success) /* out: indicates error. TRUE = success */ + bool* success) /* out: indicates error. true = success */ { char dest_dir[FN_REFLEN]; char dest_space_name[FN_REFLEN]; - ibool ok; fil_space_t* fil_space; pfs_os_file_t file; - ulint tablespace_flags; xb_filter_entry_t* table; ut_a(dbname != NULL || - !fil_is_user_tablespace_id(space_id) || - space_id == ULINT_UNDEFINED); + !fil_is_user_tablespace_id(info.space_id) || + info.space_id == ULINT_UNDEFINED); - *success = FALSE; + *success = false; if (dbname) { snprintf(dest_dir, FN_REFLEN, "%s/%s", xtrabackup_target_dir, dbname); - srv_normalize_path_for_win(dest_dir); + os_normalize_path(dest_dir); snprintf(dest_space_name, FN_REFLEN, "%s/%s", dbname, name); } else { snprintf(dest_dir, FN_REFLEN, "%s", xtrabackup_target_dir); - srv_normalize_path_for_win(dest_dir); + os_normalize_path(dest_dir); snprintf(dest_space_name, FN_REFLEN, "%s", name); } @@ -4526,7 +4026,7 @@ xb_delta_open_matching_space( snprintf(real_name, real_name_len, "%s/%s", xtrabackup_target_dir, dest_space_name); - srv_normalize_path_for_win(real_name); + os_normalize_path(real_name); /* Truncate ".ibd" */ dest_space_name[strlen(dest_space_name) - 4] = '\0'; @@ -4536,13 +4036,26 @@ xb_delta_open_matching_space( return file; } - if (!fil_is_user_tablespace_id(space_id)) { - goto found; + log_mutex_enter(); + if (!fil_is_user_tablespace_id(info.space_id)) { +found: + /* open the file and return its handle */ + + file = os_file_create_simple_no_error_handling( + 0, real_name, + OS_FILE_OPEN, OS_FILE_READ_WRITE, false, success); + + if (!*success) { + msg("xtrabackup: Cannot open file %s\n", real_name); + } +exit: + log_mutex_exit(); + return file; } /* remember space name for further reference */ table = static_cast - (ut_malloc(sizeof(xb_filter_entry_t) + + (malloc(sizeof(xb_filter_entry_t) + strlen(dest_space_name) + 1)); table->name = ((char*)table) + sizeof(xb_filter_entry_t); @@ -4555,7 +4068,8 @@ xb_delta_open_matching_space( mutex_exit(&fil_system->mutex); if (fil_space != NULL) { - if (fil_space->id == space_id || space_id == ULINT_UNDEFINED) { + if (fil_space->id == info.space_id + || info.space_id == ULINT_UNDEFINED) { /* we found matching space */ goto found; } else { @@ -4568,8 +4082,10 @@ xb_delta_open_matching_space( msg("xtrabackup: Renaming %s to %s.ibd\n", fil_space->name, tmpname); - if (!fil_rename_tablespace(NULL, fil_space->id, - tmpname, NULL)) + if (!fil_rename_tablespace( + fil_space->id, + fil_space->chain.start->name, + tmpname, NULL)) { msg("xtrabackup: Cannot rename %s to %s\n", fil_space->name, tmpname); @@ -4578,14 +4094,14 @@ xb_delta_open_matching_space( } } - if (space_id == ULINT_UNDEFINED) + if (info.space_id == ULINT_UNDEFINED) { msg("xtrabackup: Error: Cannot handle DDL operation on tablespace " "%s\n", dest_space_name); exit(EXIT_FAILURE); } mutex_enter(&fil_system->mutex); - fil_space = fil_space_get_by_id(space_id); + fil_space = fil_space_get_by_id(info.space_id); mutex_exit(&fil_system->mutex); if (fil_space != NULL) { char tmpname[FN_REFLEN]; @@ -4595,7 +4111,9 @@ xb_delta_open_matching_space( msg("xtrabackup: Renaming %s to %s\n", fil_space->name, dest_space_name); - if (!fil_rename_tablespace(NULL, fil_space->id, tmpname, + if (!fil_rename_tablespace(fil_space->id, + fil_space->chain.start->name, + tmpname, NULL)) { msg("xtrabackup: Cannot rename %s to %s\n", @@ -4607,49 +4125,30 @@ xb_delta_open_matching_space( } /* No matching space found. create the new one. */ + const ulint flags = info.page_size.is_compressed() + ? get_bit_shift(info.page_size.physical() + >> (UNIV_ZIP_SIZE_SHIFT_MIN - 1)) + << FSP_FLAGS_POS_ZIP_SSIZE + | FSP_FLAGS_MASK_POST_ANTELOPE + | FSP_FLAGS_MASK_ATOMIC_BLOBS + | (info.page_size.logical() == UNIV_PAGE_SIZE_ORIG + ? 0 + : get_bit_shift(info.page_size.logical() + >> (UNIV_ZIP_SIZE_SHIFT_MIN - 1)) + << FSP_FLAGS_POS_PAGE_SSIZE) + : FSP_FLAGS_PAGE_SSIZE(); + ut_ad(page_size_t(flags).equals_to(info.page_size)); - if (!fil_space_create(dest_space_name, space_id, 0, - FIL_TABLESPACE, 0, false)) { - msg("xtrabackup: Cannot create tablespace %s\n", - dest_space_name); - goto exit; - } - - /* Calculate correct tablespace flags for compressed tablespaces. */ - if (!zip_size || zip_size == ULINT_UNDEFINED) { - tablespace_flags = 0; - } - else { - tablespace_flags - = (get_bit_shift(zip_size >> PAGE_ZIP_MIN_SIZE_SHIFT - << 1) - << DICT_TF_ZSSIZE_SHIFT) - | DICT_TF_COMPACT - | (DICT_TF_FORMAT_ZIP << DICT_TF_FORMAT_SHIFT); - ut_a(dict_tf_get_zip_size(tablespace_flags) - == zip_size); - } - *success = xb_space_create_file(real_name, space_id, tablespace_flags, - &file); - goto exit; - -found: - /* open the file and return it's handle */ - - file = os_file_create_simple_no_error_handling(0, real_name, - OS_FILE_OPEN, - OS_FILE_READ_WRITE, - &ok,0); - - if (ok) { - *success = TRUE; + if (fil_space_create(dest_space_name, info.space_id, flags, + FIL_TYPE_TABLESPACE, 0)) { + *success = xb_space_create_file(real_name, info.space_id, + flags, &file); } else { - msg("xtrabackup: Cannot open file %s\n", real_name); + msg("xtrabackup: Cannot create tablespace %s\n", + dest_space_name); } -exit: - - return file; + goto exit; } /************************************************************************ @@ -4670,13 +4169,13 @@ xtrabackup_apply_delta( char dst_path[FN_REFLEN]; char meta_path[FN_REFLEN]; char space_name[FN_REFLEN]; - ibool success; + bool success; ibool last_buffer = FALSE; ulint page_in_buffer; ulint incremental_buffers = 0; - xb_delta_info_t info; + xb_delta_info_t info(univ_page_size, SRV_TMP_SPACE_ID); ulint page_size; ulint page_size_shift; byte* incremental_buffer_base = NULL; @@ -4706,15 +4205,15 @@ xtrabackup_apply_delta( goto error; } - srv_normalize_path_for_win(dst_path); - srv_normalize_path_for_win(src_path); - srv_normalize_path_for_win(meta_path); + os_normalize_path(dst_path); + os_normalize_path(src_path); + os_normalize_path(meta_path); if (!xb_read_delta_metadata(meta_path, &info)) { goto error; } - page_size = info.page_size; + page_size = info.page_size.physical(); page_size_shift = get_bit_shift(page_size); msg("xtrabackup: page size for %s is %lu bytes\n", src_path, page_size); @@ -4725,10 +4224,9 @@ xtrabackup_apply_delta( goto error; } - src_file = os_file_create_simple_no_error_handling(0, src_path, - OS_FILE_OPEN, - OS_FILE_READ_WRITE, - &success,0); + src_file = os_file_create_simple_no_error_handling( + 0, src_path, + OS_FILE_OPEN, OS_FILE_READ_WRITE, false, &success); if (!success) { os_file_get_last_error(TRUE); msg("xtrabackup: error: cannot open %s\n", src_path); @@ -4740,7 +4238,7 @@ xtrabackup_apply_delta( os_file_set_nocache(src_file, src_path, "OPEN"); dst_file = xb_delta_open_matching_space( - dbname, space_name, info.space_id, info.zip_size, + dbname, space_name, info, dst_path, sizeof(dst_path), &success); if (!success) { msg("xtrabackup: error: cannot open %s\n", dst_path); @@ -4753,8 +4251,7 @@ xtrabackup_apply_delta( /* allocate buffer for incremental backup (4096 pages) */ incremental_buffer_base = static_cast - (ut_malloc((page_size / 4 + 1) * - page_size)); + (malloc((page_size / 4 + 1) * page_size)); incremental_buffer = static_cast (ut_align(incremental_buffer_base, page_size)); @@ -4768,8 +4265,8 @@ xtrabackup_apply_delta( /* first block of block cluster */ offset = ((incremental_buffers * (page_size / 4)) << page_size_shift); - success = os_file_read(src_file, incremental_buffer, - offset, page_size); + success = os_file_read(IORequestRead, src_file, + incremental_buffer, offset, page_size); if (!success) { goto error; } @@ -4787,6 +4284,9 @@ xtrabackup_apply_delta( goto error; } + /* FIXME: If the .delta modifies FSP_SIZE on page 0, + extend the file to that size. */ + for (page_in_buffer = 1; page_in_buffer < page_size / 4; page_in_buffer++) { if (mach_read_from_4(incremental_buffer + page_in_buffer * 4) @@ -4797,8 +4297,9 @@ xtrabackup_apply_delta( ut_a(last_buffer || page_in_buffer == page_size / 4); /* read whole of the cluster */ - success = os_file_read(src_file, incremental_buffer, - offset, page_in_buffer * page_size); + success = os_file_read(IORequestRead, src_file, + incremental_buffer, + offset, page_in_buffer * page_size); if (!success) { goto error; } @@ -4815,7 +4316,8 @@ xtrabackup_apply_delta( if (offset_on_page == 0xFFFFFFFFUL) break; - success = os_file_write(dst_path, dst_file, + success = os_file_write(IORequestWrite, + dst_path, dst_file, incremental_buffer + page_in_buffer * page_size, (offset_on_page << @@ -4829,20 +4331,18 @@ xtrabackup_apply_delta( incremental_buffers++; } - if (incremental_buffer_base) - ut_free(incremental_buffer_base); - if (src_file != XB_FILE_UNDEFINED) + free(incremental_buffer_base); + if (src_file != OS_FILE_CLOSED) os_file_close(src_file); - if (dst_file != XB_FILE_UNDEFINED) + if (dst_file != OS_FILE_CLOSED) os_file_close(dst_file); return TRUE; error: - if (incremental_buffer_base) - ut_free(incremental_buffer_base); - if (src_file != XB_FILE_UNDEFINED) + free(incremental_buffer_base); + if (src_file != OS_FILE_CLOSED) os_file_close(src_file); - if (dst_file != XB_FILE_UNDEFINED) + if (dst_file != OS_FILE_CLOSED) os_file_close(dst_file); msg("xtrabackup: Error: xtrabackup_apply_delta(): " "failed to apply %s to %s.\n", src_path, dst_path); @@ -4903,9 +4403,7 @@ xb_process_datadir( const char* path, /*!name != 0); - len = (ib_uint32_t)strlen(table->name) + 1; + const char* table_name = table->name.m_name; + ut_a(table_name != 0); + len = (ib_uint32_t)strlen(table_name) + 1; /* Write the table name. */ mach_write_to_4(value, len); if (fwrite(&value, 1, sizeof(value), file) != sizeof(value) - || fwrite(table->name, 1, len, file) != len) { + || fwrite(table_name, 1, len, file) != len) { msg("xtrabackup: Error: writing table name."); @@ -5456,48 +4882,38 @@ static void innodb_free_param() { - srv_free_paths_and_sizes(); - free(internal_innobase_data_file_path); - internal_innobase_data_file_path = NULL; + srv_sys_space.shutdown(); free_tmpdir(&mysql_tmpdir_list); } -/************************************************************************** -Store the current binary log coordinates in a specified file. -@return 'false' on error. */ +/** Store the current binary log coordinates in a specified file. +@param[in] filename file name +@param[in] name binary log file name +@param[in] pos binary log file position +@return whether the operation succeeded */ static bool -store_binlog_info( -/*==============*/ - const char *filename) /*!< in: output file name */ +store_binlog_info(const char* filename, const char* name, ulonglong pos) { - FILE *fp; - - if (trx_sys_mysql_bin_log_name[0] == '\0') { - return(true); - } - - fp = fopen(filename, "w"); + FILE *fp = fopen(filename, "w"); if (!fp) { msg("xtrabackup: failed to open '%s'\n", filename); return(false); } - fprintf(fp, "%s\t" UINT64PF "\n", - trx_sys_mysql_bin_log_name, trx_sys_mysql_bin_log_pos); + fprintf(fp, "%s\t%llu\n", name, pos); fclose(fp); return(true); } -static void -xtrabackup_prepare_func(int argc, char ** argv) +/** Implement --prepare +@return whether the operation succeeded */ +static bool +xtrabackup_prepare_func(char** argv) { - ulint err; datafiles_iter_t *it; - fil_node_t *node; - fil_space_t *space; char metadata_path[FN_REFLEN]; /* cd to target-dir */ @@ -5506,10 +4922,11 @@ xtrabackup_prepare_func(int argc, char ** argv) { msg("xtrabackup: cannot my_setwd %s\n", xtrabackup_real_target_dir); - exit(EXIT_FAILURE); + return(false); } msg("xtrabackup: cd to %s\n", xtrabackup_real_target_dir); + int argc; for (argc = 0; argv[argc]; argc++) {} encryption_plugin_prepare_init(argc, argv); xtrabackup_target_dir= mysql_data_home_buff; @@ -5525,116 +4942,100 @@ xtrabackup_prepare_func(int argc, char ** argv) if (!xtrabackup_read_metadata(metadata_path)) { msg("xtrabackup: Error: failed to read metadata from '%s'\n", metadata_path); - exit(EXIT_FAILURE); + return(false); } if (!strcmp(metadata_type, "full-backuped")) { + if (xtrabackup_incremental) { + msg("xtrabackup: error: applying incremental backup " + "needs a prepared target.\n"); + return(false); + } msg("xtrabackup: This target seems to be not prepared yet.\n"); } else if (!strcmp(metadata_type, "log-applied")) { - msg("xtrabackup: This target seems to be already " - "prepared with --apply-log-only.\n"); - goto skip_check; - } else if (!strcmp(metadata_type, "full-prepared")) { msg("xtrabackup: This target seems to be already prepared.\n"); } else { - msg("xtrabackup: This target seems not to have correct " - "metadata...\n"); - exit(EXIT_FAILURE); + msg("xtrabackup: This target does not have correct metadata.\n"); + return(false); } - if (xtrabackup_incremental) { - msg("xtrabackup: error: applying incremental backup " - "needs target prepared with --apply-log-only.\n"); - exit(EXIT_FAILURE); - } -skip_check: - if (xtrabackup_incremental - && metadata_to_lsn != incremental_lsn) { + bool ok = !xtrabackup_incremental + || metadata_to_lsn == incremental_lsn; + if (!ok) { msg("xtrabackup: error: This incremental backup seems " "not to be proper for the target.\n" "xtrabackup: Check 'to_lsn' of the target and " "'from_lsn' of the incremental.\n"); - exit(EXIT_FAILURE); + return(false); } - /* Create logfiles for recovery from 'xtrabackup_logfile', before start InnoDB */ srv_max_n_threads = 1000; + srv_undo_logs = 1; srv_n_purge_threads = 1; - ut_mem_init(); - /* temporally dummy value to avoid crash */ - srv_page_size_shift = 14; - srv_page_size = (1 << srv_page_size_shift); - os_sync_init(); - sync_init(); - os_io_init_simple(); - mem_init(srv_mem_pool_size); - ut_crc32_init(); - -#ifdef WITH_INNODB_DISALLOW_WRITES - srv_allow_writes_event = os_event_create(); - os_event_set(srv_allow_writes_event); -#endif xb_filters_init(); - if (xtrabackup_init_temp_log()) - goto error_cleanup; - - if(innodb_init_param()) { - goto error_cleanup; - } - - xb_normalize_init_values(); + srv_log_group_home_dir = NULL; + srv_thread_concurrency = 1; if (xtrabackup_incremental) { - err = xb_data_files_init(); + if (innodb_init_param()) { +error_cleanup: + xb_filters_free(); + return(false); + } + + xb_normalize_init_values(); + sync_check_init(); + ut_d(sync_check_enable()); + ut_crc32_init(); + recv_sys_init(); + log_sys_init(); + recv_recovery_on = true; + +#ifdef WITH_INNODB_DISALLOW_WRITES + srv_allow_writes_event = os_event_create(0); + os_event_set(srv_allow_writes_event); +#endif + + dberr_t err = xb_data_files_init(); if (err != DB_SUCCESS) { msg("xtrabackup: error: xb_data_files_init() failed " - "with error code %lu\n", err); + "with error %s\n", ut_strerr(err)); goto error_cleanup; } - } - if (xtrabackup_incremental) { + inc_dir_tables_hash = hash_create(1000); - if(!xtrabackup_apply_deltas()) { - xb_data_files_close(); - xb_filter_hash_free(inc_dir_tables_hash); - goto error_cleanup; - } - } - if (xtrabackup_incremental) { - xb_data_files_close(); - } - if (xtrabackup_incremental) { - /* Cleanup datadir from tablespaces deleted between full and - incremental backups */ + ok = xtrabackup_apply_deltas(); - xb_process_datadir("./", ".ibd", rm_if_not_found, NULL); + xb_data_files_close(); + + if (ok) { + /* Cleanup datadir from tablespaces deleted + between full and incremental backups */ + + xb_process_datadir("./", ".ibd", rm_if_not_found); + } xb_filter_hash_free(inc_dir_tables_hash); - } - if (fil_system) { + fil_close(); +#ifdef WITH_INNODB_DISALLOW_WRITES + os_event_destroy(srv_allow_writes_event); +#endif + innodb_free_param(); + log_shutdown(); + sync_check_close(); + if (!ok) goto error_cleanup; } - mem_close(); - ut_free_all_mem(); - - innodb_free_param(); - sync_close(); - sync_initialized = FALSE; - - /* Reset the configuration as it might have been changed by - xb_data_files_init(). */ - if(innodb_init_param()) { + if (innodb_init_param()) { goto error_cleanup; } - srv_apply_log_only = (bool) xtrabackup_apply_log_only; - /* increase IO threads */ - if(srv_n_file_io_threads < 10) { + if (srv_n_file_io_threads < 10) { srv_n_read_io_threads = 4; srv_n_write_io_threads = 4; } @@ -5649,85 +5050,51 @@ skip_check: srv_max_dirty_pages_pct_lwm = srv_max_buf_pool_modified_pct; } - if(innodb_init()) + if (innodb_init()) { goto error_cleanup; - - if (xtrabackup_incremental) { - - it = datafiles_iter_new(fil_system); - if (it == NULL) { - msg("xtrabackup: Error: datafiles_iter_new() failed.\n"); - exit(EXIT_FAILURE); } - while ((node = datafiles_iter_next(it)) != NULL) { - byte *header; - ulint size; - ulint actual_size; - mtr_t mtr; - buf_block_t *block; - ulint flags; - - space = node->space; - - /* Align space sizes along with fsp header. We want to process - each space once, so skip all nodes except the first one in a - multi-node space. */ - if (UT_LIST_GET_PREV(chain, node) != NULL) { - continue; - } - - mtr_start(&mtr); - - mtr_s_lock(fil_space_get_latch(space->id, &flags), &mtr); - - block = buf_page_get(space->id, - dict_tf_get_zip_size(flags), - 0, RW_S_LATCH, &mtr); - header = FSP_HEADER_OFFSET + buf_block_get_frame(block); - - size = mtr_read_ulint(header + FSP_SIZE, MLOG_4BYTES, - &mtr); - - mtr_commit(&mtr); - - fil_extend_space_to_desired_size(&actual_size, space->id, size); - } - - datafiles_iter_free(it); - - } /* if (xtrabackup_incremental) */ - if (xtrabackup_export) { +#if 1 // FIXME: remove the option or fix the logic + /* In MariaDB 10.2, undo log processing would need the + ability to evaluate indexed virtual columns, and we + have not initialized the necessary infrastructure. */ + msg("xtrabackup: --export does not work!\n"); + ok = false; + } else if (xtrabackup_export) { +#endif msg("xtrabackup: export option is specified.\n"); + + /* To allow subsequent MariaDB server startup independent + of the value of --innodb-log-checksums, + unconditionally enable redo log checksums. */ + log_checksum_algorithm_ptr = log_block_calc_checksum_crc32; + pfs_os_file_t info_file; char info_file_path[FN_REFLEN]; - ibool success; + bool success; char table_name[FN_REFLEN]; byte* page; byte* buf = NULL; - buf = static_cast(ut_malloc(UNIV_PAGE_SIZE * 2)); + buf = static_cast(malloc(UNIV_PAGE_SIZE * 2)); page = static_cast(ut_align(buf, UNIV_PAGE_SIZE)); - /* flush insert buffer at shutdwon */ - innobase_fast_shutdown = 0; - it = datafiles_iter_new(fil_system); if (it == NULL) { msg("xtrabackup: Error: datafiles_iter_new() " "failed.\n"); - exit(EXIT_FAILURE); - } - while ((node = datafiles_iter_next(it)) != NULL) { + ok = false; + } else + while (fil_node_t *node = datafiles_iter_next(it)) { int len; char *next, *prev, *p; dict_table_t* table; dict_index_t* index; ulint n_index; - space = node->space; + const fil_space_t* space = node->space; /* treat file_per_table only */ if (!fil_is_user_tablespace_id(space->id)) { @@ -5782,15 +5149,14 @@ skip_check: "than 31 indexes, .exp file was not " "generated. Table will fail to import " "on server version prior to 5.6.\n", - table->name); + table->name.m_name); goto next_node; } /* init exp file */ - memset(page, 0, UNIV_PAGE_SIZE); - mach_write_to_4(page , 0x78706f72UL); - mach_write_to_4(page + 4, 0x74696e66UL);/*"xportinf"*/ + memcpy(page, "xportinf", 8); mach_write_to_4(page + 8, n_index); + memset(page + 12, 0, UNIV_PAGE_SIZE - 12); strncpy((char *) page + 12, table_name, 500); @@ -5810,7 +5176,7 @@ skip_check: msg("xtrabackup: name=%s, " "id.low=%lu, page=%lu\n", - index->name, + index->name(), (ulint)(index->id & 0xFFFFFFFFUL), (ulint) index->page); @@ -5818,18 +5184,18 @@ skip_check: n_index++; } - srv_normalize_path_for_win(info_file_path); + os_normalize_path(info_file_path); info_file = os_file_create( 0, info_file_path, OS_FILE_OVERWRITE, OS_FILE_NORMAL, OS_DATA_FILE, - &success,0); + false, &success); if (!success) { os_file_get_last_error(TRUE); goto next_node; } - success = os_file_write(info_file_path, + success = os_file_write(IORequestWrite, info_file_path, info_file, page, 0, UNIV_PAGE_SIZE); if (!success) { @@ -5842,76 +5208,73 @@ skip_check: goto next_node; } next_node: - if (info_file != XB_FILE_UNDEFINED) { + if (info_file != OS_FILE_CLOSED) { os_file_close(info_file); - info_file = XB_FILE_UNDEFINED; + info_file = OS_FILE_CLOSED; } mutex_exit(&(dict_sys->mutex)); } - ut_free(buf); + free(buf); } - /* print the binary log position */ - trx_sys_print_mysql_binlog_offset(); - msg("\n"); + if (ok) { + mtr_t mtr; + mtr.start(); + const trx_sysf_t* sys_header = trx_sysf_get(&mtr); - /* output to xtrabackup_binlog_pos_innodb and (if - backup_safe_binlog_info was available on the server) to - xtrabackup_binlog_info. In the latter case xtrabackup_binlog_pos_innodb - becomes redundant and is created only for compatibility. */ - if (!store_binlog_info("xtrabackup_binlog_pos_innodb") || - (recover_binlog_info && - !store_binlog_info(XTRABACKUP_BINLOG_INFO))) { + if (mach_read_from_4(TRX_SYS_MYSQL_LOG_INFO + + TRX_SYS_MYSQL_LOG_MAGIC_N_FLD + + sys_header) + == TRX_SYS_MYSQL_LOG_MAGIC_N) { + ulonglong pos = mach_read_from_8( + TRX_SYS_MYSQL_LOG_INFO + + TRX_SYS_MYSQL_LOG_OFFSET + + sys_header); + const char* name = reinterpret_cast( + TRX_SYS_MYSQL_LOG_INFO + TRX_SYS_MYSQL_LOG_NAME + + sys_header); + msg("Last binlog file %s, position %llu\n", name, pos); - exit(EXIT_FAILURE); + /* output to xtrabackup_binlog_pos_innodb and + (if backup_safe_binlog_info was available on + the server) to xtrabackup_binlog_info. In the + latter case xtrabackup_binlog_pos_innodb + becomes redundant and is created only for + compatibility. */ + ok = store_binlog_info( + "xtrabackup_binlog_pos_innodb", name, pos) + && (!recover_binlog_info || store_binlog_info( + XTRABACKUP_BINLOG_INFO, + name, pos)); + } + + mtr.commit(); } /* Check whether the log is applied enough or not. */ - if ((xtrabackup_incremental - && srv_start_lsn < incremental_to_lsn) - ||(!xtrabackup_incremental - && srv_start_lsn < metadata_to_lsn)) { + const lsn_t target_lsn = xtrabackup_incremental + ? incremental_to_lsn : metadata_to_lsn; + if ((srv_start_lsn || fil_space_get(SRV_LOG_SPACE_FIRST_ID)) + && srv_start_lsn < target_lsn) { msg("xtrabackup: error: " - "The transaction log file is corrupted.\n" - "xtrabackup: error: " - "The log was not applied to the intended LSN!\n"); - msg("xtrabackup: Log applied to lsn " LSN_PF "\n", - srv_start_lsn); - if (xtrabackup_incremental) { - msg("xtrabackup: The intended lsn is " LSN_PF "\n", - incremental_to_lsn); - } else { - msg("xtrabackup: The intended lsn is " LSN_PF "\n", - metadata_to_lsn); - } - exit(EXIT_FAILURE); + "The log was only applied up to LSN " LSN_PF + ", instead of " LSN_PF "\n", + srv_start_lsn, target_lsn); + ok = false; } #ifdef WITH_WSREP - xb_write_galera_info(xtrabackup_incremental); + else if (ok) xb_write_galera_info(xtrabackup_incremental); #endif - innodb_end(); - - innodb_free_param(); - - sync_initialized = FALSE; - - /* re-init necessary components */ - ut_mem_init(); - os_sync_init(); - sync_init(); - os_io_init_simple(); - - if(xtrabackup_close_temp_log(TRUE)) - exit(EXIT_FAILURE); + innodb_shutdown(); + innodb_free_param(); /* output to metadata file */ - { + if (ok) { char filename[FN_REFLEN]; - strcpy(metadata_type, srv_apply_log_only ? - "log-applied" : "full-prepared"); + strcpy(metadata_type, "log-applied"); if(xtrabackup_incremental && metadata_to_lsn < incremental_to_lsn) @@ -5925,73 +5288,21 @@ next_node: msg("xtrabackup: Error: failed to write metadata " "to '%s'\n", filename); - exit(EXIT_FAILURE); - } - - if(xtrabackup_extra_lsndir) { + ok = false; + } else if (xtrabackup_extra_lsndir) { sprintf(filename, "%s/%s", xtrabackup_extra_lsndir, XTRABACKUP_METADATA_FILENAME); if (!xtrabackup_write_metadata(filename)) { msg("xtrabackup: Error: failed to write " "metadata to '%s'\n", filename); - exit(EXIT_FAILURE); + ok = false; } } } - if (!apply_log_finish()) { - exit(EXIT_FAILURE); - } - - sync_close(); - sync_initialized = FALSE; - if (fil_system) { - fil_close(); - } - - ut_free_all_mem(); - - /* start InnoDB once again to create log files */ - - if (!xtrabackup_apply_log_only) { - - /* xtrabackup_incremental_dir is used to indicate that - we are going to apply incremental backup. Here we already - applied incremental backup and are about to do final prepare - of the full backup */ - xtrabackup_incremental_dir = NULL; - - if(innodb_init_param()) { - goto error; - } - - srv_apply_log_only = false; - - /* increase IO threads */ - if(srv_n_file_io_threads < 10) { - srv_n_read_io_threads = 4; - srv_n_write_io_threads = 4; - } - - srv_shutdown_state = SRV_SHUTDOWN_NONE; - - if(innodb_init()) - goto error; - - innodb_end(); - innodb_free_param(); - - } + if (ok) ok = apply_log_finish(); xb_filters_free(); - - return; - -error_cleanup: - xtrabackup_close_temp_log(FALSE); - xb_filters_free(); - -error: - exit(EXIT_FAILURE); + return ok; } /************************************************************************** @@ -6084,7 +5395,8 @@ extern void init_signals(void); /* Messages . Avoid loading errmsg.sys file */ void setup_error_messages() { - static const char *all_msgs[ER_ERROR_LAST - ER_ERROR_FIRST +1]; + static const char *my_msgs[ERRORS_PER_RANGE]; + static const char **all_msgs[] = { my_msgs, my_msgs, my_msgs, my_msgs }; my_default_lc_messages = &my_locale_en_US; my_default_lc_messages->errmsgs->errmsgs = all_msgs; @@ -6111,24 +5423,20 @@ void setup_error_messages() }; for (int i = 0; i < (int)array_elements(all_msgs); i++) - all_msgs[i] = "Unknown error"; + all_msgs[0][i] = "Unknown error"; for (int i = 0; i < (int)array_elements(xb_msgs); i++) - all_msgs[xb_msgs[i].id - ER_ERROR_FIRST] = xb_msgs[i].fmt; + all_msgs[0][xb_msgs[i].id - ER_ERROR_FIRST] = xb_msgs[i].fmt; } -extern my_bool(*dict_check_if_skip_table)(const char* name) ; - void handle_options(int argc, char **argv, char ***argv_client, char ***argv_server) { /* Setup some variables for Innodb.*/ - srv_xtrabackup = true; - + srv_operation = SRV_OPERATION_RESTORE; files_charset_info = &my_charset_utf8_general_ci; - dict_check_if_skip_table = check_if_skip_table; setup_error_messages(); sys_var_init(); @@ -6312,25 +5620,21 @@ handle_options(int argc, char **argv, char ***argv_client, char ***argv_server) } } -/* ================= main =================== */ -extern my_bool(*fil_check_if_skip_database_by_path)(const char* name); +static int main_low(char** argv); +/* ================= main =================== */ int main(int argc, char **argv) { char **client_defaults, **server_defaults; - char cwd[FN_REFLEN]; - static char INNOBACKUPEX_EXE[]= "innobackupex"; + static char INNOBACKUPEX_EXE[]= "innobackupex"; if (argc > 1 && (strcmp(argv[1], "--innobackupex") == 0)) { argv++; argc--; - argv[0] = INNOBACKUPEX_EXE; + argv[0] = INNOBACKUPEX_EXE; innobackupex_mode = true; } - /* Setup skip fil_load_single_tablespaces callback.*/ - fil_check_if_skip_database_by_path = check_if_skip_database_by_path; - init_signals(); MY_INIT(argv[0]); @@ -6349,30 +5653,69 @@ int main(int argc, char **argv) system_charset_info = &my_charset_utf8_general_ci; key_map_full.set_all(); + logger.init_base(); + logger.set_handlers(LOG_FILE, LOG_NONE, LOG_NONE); + mysql_mutex_init(key_LOCK_error_log, &LOCK_error_log, + MY_MUTEX_INIT_FAST); + handle_options(argc, argv, &client_defaults, &server_defaults); - int argc_server; - for (argc_server = 0; server_defaults[argc_server]; argc_server++) {} +#ifndef DBUG_OFF + if (dbug_option) { + DBUG_SET_INITIAL(dbug_option); + DBUG_SET(dbug_option); + } +#endif - int argc_client; - for (argc_client = 0; client_defaults[argc_client]; argc_client++) {} + int status = main_low(server_defaults); + backup_cleanup(); + if (innobackupex_mode) { + ibx_cleanup(); + } + + free_defaults(client_defaults); + free_defaults(server_defaults); + +#ifndef DBUG_OFF + if (dbug_option) { + DBUG_END(); + } +#endif + + if (THR_THD) + (void) pthread_key_delete(THR_THD); + + logger.cleanup_base(); + mysql_mutex_destroy(&LOCK_error_log); + + if (status == EXIT_SUCCESS) { + msg_ts("completed OK!\n"); + } + + return status; +} + +static int main_low(char** argv) +{ if (innobackupex_mode) { if (!ibx_init()) { - exit(EXIT_FAILURE); + return(EXIT_FAILURE); } } - if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) { + if (!xtrabackup_print_param && !xtrabackup_prepare + && !strcmp(mysql_data_home, "./")) { if (!xtrabackup_print_param) usage(); msg("\nxtrabackup: Error: Please set parameter 'datadir'\n"); - exit(EXIT_FAILURE); + return(EXIT_FAILURE); } /* Expand target-dir, incremental-basedir, etc. */ + char cwd[FN_REFLEN]; my_getwd(cwd, sizeof(cwd), MYF(0)); my_load_path(xtrabackup_real_target_dir, @@ -6438,7 +5781,7 @@ int main(int argc, char **argv) if (error) { msg("xtrabackup: value '%s' may be wrong format for " "incremental option.\n", xtrabackup_incremental); - exit(EXIT_FAILURE); + return(EXIT_FAILURE); } } else if (xtrabackup_backup && xtrabackup_incremental_basedir) { char filename[FN_REFLEN]; @@ -6448,7 +5791,7 @@ int main(int argc, char **argv) if (!xtrabackup_read_metadata(filename)) { msg("xtrabackup: error: failed to read metadata from " "%s\n", filename); - exit(EXIT_FAILURE); + return(EXIT_FAILURE); } incremental_lsn = metadata_to_lsn; @@ -6461,7 +5804,7 @@ int main(int argc, char **argv) if (!xtrabackup_read_metadata(filename)) { msg("xtrabackup: error: failed to read metadata from " "%s\n", filename); - exit(EXIT_FAILURE); + return(EXIT_FAILURE); } incremental_lsn = metadata_from_lsn; @@ -6478,15 +5821,13 @@ int main(int argc, char **argv) } if (!xb_init()) { - exit(EXIT_FAILURE); + return(EXIT_FAILURE); } /* --print-param */ if (xtrabackup_print_param) { - printf("%s", print_param_str.str().c_str()); - - exit(EXIT_SUCCESS); + return(EXIT_SUCCESS); } print_version(); @@ -6512,7 +5853,7 @@ int main(int argc, char **argv) if (xtrabackup_decrypt_decompress) num++; if (num != 1) { /* !XOR (for now) */ usage(); - exit(EXIT_FAILURE); + return(EXIT_FAILURE); } } @@ -6523,41 +5864,28 @@ int main(int argc, char **argv) #endif /* --backup */ - if (xtrabackup_backup) - xtrabackup_backup_func(); + if (xtrabackup_backup && !xtrabackup_backup_func()) { + return(EXIT_FAILURE); + } /* --prepare */ - if (xtrabackup_prepare) { - xtrabackup_prepare_func(argc_server, server_defaults); + if (xtrabackup_prepare + && !xtrabackup_prepare_func(argv)) { + return(EXIT_FAILURE); } if (xtrabackup_copy_back || xtrabackup_move_back) { if (!check_if_param_set("datadir")) { msg("Error: datadir must be specified.\n"); - exit(EXIT_FAILURE); + return(EXIT_FAILURE); } if (!copy_back()) - exit(EXIT_FAILURE); + return(EXIT_FAILURE); } if (xtrabackup_decrypt_decompress && !decrypt_decompress()) { - exit(EXIT_FAILURE); + return(EXIT_FAILURE); } - backup_cleanup(); - - if (innobackupex_mode) { - ibx_cleanup(); - } - - - free_defaults(client_defaults); - free_defaults(server_defaults); - - if (THR_THD) - (void) pthread_key_delete(THR_THD); - - msg_ts("completed OK!\n"); - - exit(EXIT_SUCCESS); + return(EXIT_SUCCESS); } diff --git a/extra/mariabackup/xtrabackup.h b/extra/mariabackup/xtrabackup.h index eafc848fd43..b883194ef86 100644 --- a/extra/mariabackup/xtrabackup.h +++ b/extra/mariabackup/xtrabackup.h @@ -26,26 +26,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #include "xbstream.h" #include "changed_page_bitmap.h" -#ifdef __WIN__ -#define XB_FILE_UNDEFINED INVALID_HANDLE_VALUE -#else -#define XB_FILE_UNDEFINED (-1) -#endif +struct xb_delta_info_t +{ + xb_delta_info_t(page_size_t page_size, ulint space_id) + : page_size(page_size), space_id(space_id) {} -typedef struct { - ulint page_size; - ulint zip_size; - ulint space_id; -} xb_delta_info_t; - -/* ======== Datafiles iterator ======== */ -typedef struct { - fil_system_t *system; - fil_space_t *space; - fil_node_t *node; - ibool started; - os_ib_mutex_t mutex; -} datafiles_iter_t; + page_size_t page_size; + ulint space_id; +}; /* value of the --incremental option */ extern lsn_t incremental_lsn; @@ -84,15 +72,11 @@ extern ibool xtrabackup_compress; extern my_bool xtrabackup_backup; extern my_bool xtrabackup_prepare; -extern my_bool xtrabackup_apply_log_only; extern my_bool xtrabackup_copy_back; extern my_bool xtrabackup_move_back; extern my_bool xtrabackup_decrypt_decompress; extern char *innobase_data_file_path; -extern char *innobase_doublewrite_file; -extern longlong innobase_log_file_size; -extern long innobase_log_files_in_group; extern longlong innobase_page_size; extern int xtrabackup_parallel; @@ -108,9 +92,7 @@ extern "C"{ } #endif extern my_bool xtrabackup_export; -extern char *xtrabackup_incremental_basedir; extern char *xtrabackup_extra_lsndir; -extern char *xtrabackup_incremental_dir; extern ulint xtrabackup_log_copy_interval; extern char *xtrabackup_stream_str; extern long xtrabackup_throttle; @@ -166,14 +148,9 @@ void xtrabackup_io_throttling(void); my_bool xb_write_delta_metadata(const char *filename, const xb_delta_info_t *info); -datafiles_iter_t *datafiles_iter_new(fil_system_t *f_system); -fil_node_t *datafiles_iter_next(datafiles_iter_t *it); -void datafiles_iter_free(datafiles_iter_t *it); - -/*********************************************************************** -Reads the space flags from a given data file and returns the compressed -page size, or 0 if the space is not compressed. */ -ulint xb_get_zip_size(pfs_os_file_t file); +/** @return the tablespace flags from a given data file +@retval ULINT_UNDEFINED if the file is not readable */ +ulint xb_get_space_flags(pfs_os_file_t file); /************************************************************************ Checks if a table specified as a name in the form "database/name" (InnoDB 5.6) @@ -204,17 +181,10 @@ bool check_if_param_set(const char *param); #if defined(HAVE_OPENSSL) -extern my_bool opt_use_ssl; extern my_bool opt_ssl_verify_server_cert; -#if !defined(HAVE_YASSL) -extern char *opt_server_public_key; -#endif #endif -void -xtrabackup_backup_func(void); - my_bool xb_get_one_option(int optid, const struct my_option *opt __attribute__((unused)), diff --git a/mysql-test/suite/mariabackup/bug1509812-master.opt b/mysql-test/suite/mariabackup/bug1509812-master.opt deleted file mode 100644 index de29ed41f59..00000000000 --- a/mysql-test/suite/mariabackup/bug1509812-master.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-skip-log-bin \ No newline at end of file diff --git a/mysql-test/suite/mariabackup/disabled.def b/mysql-test/suite/mariabackup/disabled.def new file mode 100644 index 00000000000..d3c11872f0a --- /dev/null +++ b/mysql-test/suite/mariabackup/disabled.def @@ -0,0 +1,2 @@ +partial : xtrabackup --export does not work +xb_page_compress : xtrabackup --export does not work diff --git a/mysql-test/suite/mariabackup/full_backup.test b/mysql-test/suite/mariabackup/full_backup.test index f987410cf76..d1d2ea21c08 100644 --- a/mysql-test/suite/mariabackup/full_backup.test +++ b/mysql-test/suite/mariabackup/full_backup.test @@ -1,3 +1,5 @@ +--source include/innodb_page_size.inc + CREATE TABLE t(i INT) ENGINE INNODB; INSERT INTO t VALUES(1); echo # xtrabackup backup; diff --git a/mysql-test/suite/mariabackup/include/restart_and_restore.inc b/mysql-test/suite/mariabackup/include/restart_and_restore.inc index 7ee4a660b78..9056867b07f 100644 --- a/mysql-test/suite/mariabackup/include/restart_and_restore.inc +++ b/mysql-test/suite/mariabackup/include/restart_and_restore.inc @@ -1,15 +1,9 @@ -let $_server_id= `SELECT @@server_id`; let $_datadir= `SELECT @@datadir`; -let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect; -exec echo "wait" > $_expect_file_name; echo # shutdown server; -shutdown_server; +--source include/shutdown_mysqld.inc echo # remove datadir; rmdir $_datadir; echo # xtrabackup move back; exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2 --throttle=1; echo # restart server; -exec echo "restart" > $_expect_file_name; -enable_reconnect; -source include/wait_until_connected_again.inc; -disable_reconnect; +--source include/start_mysqld.inc diff --git a/mysql-test/suite/mariabackup/incremental_backup.test b/mysql-test/suite/mariabackup/incremental_backup.test index b92d7b323ac..dde0aa3b7cb 100644 --- a/mysql-test/suite/mariabackup/incremental_backup.test +++ b/mysql-test/suite/mariabackup/incremental_backup.test @@ -1,10 +1,10 @@ -call mtr.add_suppression("InnoDB: New log files created"); +--source include/innodb_page_size.inc +call mtr.add_suppression("InnoDB: New log files created"); let $basedir=$MYSQLTEST_VARDIR/tmp/backup; let $incremental_dir=$MYSQLTEST_VARDIR/tmp/backup_inc1; - CREATE TABLE t(i INT) ENGINE INNODB; INSERT INTO t VALUES(1); @@ -18,7 +18,7 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir --disable_result_log echo # Prepare full backup, apply incremental one; -exec $XTRABACKUP --prepare --apply-log-only --target-dir=$basedir; +exec $XTRABACKUP --prepare --target-dir=$basedir; exec $XTRABACKUP --prepare --target-dir=$basedir --incremental-dir=$incremental_dir ; echo # Restore and check results; @@ -32,4 +32,3 @@ DROP TABLE t; # Cleanup rmdir $basedir; rmdir $incremental_dir; - diff --git a/mysql-test/suite/mariabackup/incremental_encrypted.test b/mysql-test/suite/mariabackup/incremental_encrypted.test index 04f4ba5d18a..8bcada493c6 100644 --- a/mysql-test/suite/mariabackup/incremental_encrypted.test +++ b/mysql-test/suite/mariabackup/incremental_encrypted.test @@ -1,3 +1,5 @@ +--source include/innodb_page_size.inc + if (!$EXAMPLE_KEY_MANAGEMENT_SO) { --skip needs example_key_management plugin @@ -24,7 +26,7 @@ SELECT * FROM t; --disable_result_log exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$incremental_dir --incremental-basedir=$basedir; echo # Prepare full backup, apply incremental one; -exec $XTRABACKUP --prepare --apply-log-only --target-dir=$basedir; +exec $XTRABACKUP --prepare --target-dir=$basedir; exec $XTRABACKUP --prepare --target-dir=$basedir --incremental-dir=$incremental_dir; echo # Restore and check results; diff --git a/mysql-test/suite/mariabackup/partial.test b/mysql-test/suite/mariabackup/partial.test index 3b1de8ebc25..9c774b2df03 100644 --- a/mysql-test/suite/mariabackup/partial.test +++ b/mysql-test/suite/mariabackup/partial.test @@ -1,3 +1,5 @@ +#--source include/innodb_page_size.inc + # Export single table from backup # (xtrabackup with --prepare --export) @@ -28,4 +30,3 @@ SELECT * FROM t1; DROP TABLE t1; DROP TABLE t2; rmdir $targetdir; - diff --git a/mysql-test/suite/mariabackup/partial_exclude.test b/mysql-test/suite/mariabackup/partial_exclude.test index 631f9d7ee71..cd21ecff29b 100644 --- a/mysql-test/suite/mariabackup/partial_exclude.test +++ b/mysql-test/suite/mariabackup/partial_exclude.test @@ -1,3 +1,5 @@ +#--source include/innodb_page_size.inc + # Test --databases-exclude and --tables-exclude feature of xtrabackup 2.3.8 CREATE TABLE t1(i INT) ENGINE INNODB; @@ -27,4 +29,3 @@ DROP TABLE t1; DROP TABLE t2; DROP DATABASE db2; rmdir $targetdir; - diff --git a/mysql-test/suite/mariabackup/small_ibd.test b/mysql-test/suite/mariabackup/small_ibd.test index 23d6b08c047..e8175fce7c9 100644 --- a/mysql-test/suite/mariabackup/small_ibd.test +++ b/mysql-test/suite/mariabackup/small_ibd.test @@ -1,3 +1,5 @@ +--source include/innodb_page_size.inc + # Check if ibd smaller than page size are skipped # It is possible, due to race conditions that new file # is created by server while xtrabackup is running @@ -15,4 +17,3 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir= --enable_result_log remove_file $_datadir/test/small.ibd; rmdir $targetdir; - diff --git a/mysql-test/suite/mariabackup/suite.opt b/mysql-test/suite/mariabackup/suite.opt index ec00a407620..ba78b2d8957 100644 --- a/mysql-test/suite/mariabackup/suite.opt +++ b/mysql-test/suite/mariabackup/suite.opt @@ -1 +1 @@ ---innodb --changed_page_bitmaps --innodb-file-format=Barracuda \ No newline at end of file +--innodb --loose-changed_page_bitmaps --innodb-file-format=Barracuda \ No newline at end of file diff --git a/mysql-test/suite/mariabackup/xb_aws_key_management.test b/mysql-test/suite/mariabackup/xb_aws_key_management.test index ca01be607c7..28ef459f853 100644 --- a/mysql-test/suite/mariabackup/xb_aws_key_management.test +++ b/mysql-test/suite/mariabackup/xb_aws_key_management.test @@ -1,3 +1,5 @@ +--source include/innodb_page_size.inc + if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'aws_key_management' AND PLUGIN_STATUS='ACTIVE'`) { --skip needs aws_key_management plugin plugin diff --git a/mysql-test/suite/mariabackup/xb_compressed_encrypted.test b/mysql-test/suite/mariabackup/xb_compressed_encrypted.test index 11f63eb0330..6af0fdba8fb 100644 --- a/mysql-test/suite/mariabackup/xb_compressed_encrypted.test +++ b/mysql-test/suite/mariabackup/xb_compressed_encrypted.test @@ -1,7 +1,8 @@ -source include/have_file_key_management.inc; +#--source include/innodb_page_size_small.inc +--source include/have_file_key_management.inc CREATE TABLE t1(c1 INT, b VARCHAR(2400), index(b(100),c1)) ENGINE=INNODB ROW_FORMAT=compressed ENCRYPTED=YES; - + DELIMITER //; CREATE PROCEDURE innodb_insert_proc (REPEAT_COUNT INT) BEGIN @@ -14,12 +15,12 @@ BEGIN END// DELIMITER ;// COMMIT; - + SET AUTOCOMMIT=0; CALL innodb_insert_proc(50000); COMMIT; - + echo # xtrabackup backup; --disable_result_log let $targetdir=$MYSQLTEST_VARDIR/tmp/backup; diff --git a/mysql-test/suite/mariabackup/xb_file_key_management.result b/mysql-test/suite/mariabackup/xb_file_key_management.result index 30aa530698b..8972da32f8b 100644 --- a/mysql-test/suite/mariabackup/xb_file_key_management.result +++ b/mysql-test/suite/mariabackup/xb_file_key_management.result @@ -1,7 +1,7 @@ CREATE TABLE t(c VARCHAR(10)) ENGINE INNODB encrypted=yes; INSERT INTO t VALUES('foobar1'); # xtrabackup backup -NOT FOUND /foobar1/ in xtrabackup_logfile +NOT FOUND /foobar1/ in ib_logfile0 # expect NOT FOUND INSERT INTO t VALUES('foobar2'); # xtrabackup prepare @@ -9,8 +9,6 @@ INSERT INTO t VALUES('foobar2'); # remove datadir # xtrabackup move back # restart server -NOT FOUND /foobar1/ in xtrabackup_logfile -# expect NOT FOUND SELECT * FROM t; c foobar1 diff --git a/mysql-test/suite/mariabackup/xb_file_key_management.test b/mysql-test/suite/mariabackup/xb_file_key_management.test index be0b15eb387..3887a889aaa 100644 --- a/mysql-test/suite/mariabackup/xb_file_key_management.test +++ b/mysql-test/suite/mariabackup/xb_file_key_management.test @@ -1,4 +1,5 @@ -source include/have_file_key_management.inc; +#--source include/innodb_page_size.inc +--source include/have_file_key_management.inc CREATE TABLE t(c VARCHAR(10)) ENGINE INNODB encrypted=yes; INSERT INTO t VALUES('foobar1'); @@ -10,7 +11,7 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir= --let SEARCH_RANGE = 10000000 --let SEARCH_PATTERN=foobar1 ---let SEARCH_FILE=$targetdir/xtrabackup_logfile +--let SEARCH_FILE=$targetdir/ib_logfile0 --source include/search_pattern_in_file.inc --echo # expect NOT FOUND @@ -22,18 +23,8 @@ exec $XTRABACKUP --prepare --target-dir=$targetdir; -- source include/restart_and_restore.inc --enable_result_log -# -# Recheck that plain text data ( -# in not in the log, after prepare -# (MDEV-11538) - ---let SEARCH_RANGE = 10000000 ---let SEARCH_PATTERN=foobar1 ---let SEARCH_FILE=$targetdir/xtrabackup_logfile ---source include/search_pattern_in_file.inc ---echo # expect NOT FOUND +--list_files $targetdir ib_logfile* SELECT * FROM t; DROP TABLE t; rmdir $targetdir; - diff --git a/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test b/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test index a98d7802d76..d5a5003c11a 100644 --- a/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test +++ b/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test @@ -1,4 +1,5 @@ -source include/have_file_key_management.inc; +#--source include/innodb_page_size.inc +--source include/have_file_key_management.inc CREATE TABLE film_text ( film_id SMALLINT NOT NULL, diff --git a/mysql-test/suite/mariabackup/xb_history.test b/mysql-test/suite/mariabackup/xb_history.test index 28de50127c6..54ec5f2e729 100644 --- a/mysql-test/suite/mariabackup/xb_history.test +++ b/mysql-test/suite/mariabackup/xb_history.test @@ -1,3 +1,5 @@ +#--source include/innodb_page_size.inc + let $targetdir=$MYSQLTEST_VARDIR/tmp/backup; --disable_result_log exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --history=foo --backup --target-dir=$targetdir; diff --git a/mysql-test/suite/mariabackup/xb_page_compress.test b/mysql-test/suite/mariabackup/xb_page_compress.test index 876aa1a2791..0e9a7d6987c 100644 --- a/mysql-test/suite/mariabackup/xb_page_compress.test +++ b/mysql-test/suite/mariabackup/xb_page_compress.test @@ -1,3 +1,5 @@ +#--source include/innodb_page_size.inc + CREATE TABLE t1(c1 INT, b CHAR(20)) ENGINE=INNODB PAGE_COMPRESSED=1; DELIMITER //; @@ -41,4 +43,3 @@ SELECT COUNT(*) FROM t1; DROP PROCEDURE innodb_insert_proc; DROP TABLE t1; rmdir $targetdir; - diff --git a/mysql-test/suite/mariabackup/xb_partition.test b/mysql-test/suite/mariabackup/xb_partition.test index f051a52edbc..e6f8c5d996f 100644 --- a/mysql-test/suite/mariabackup/xb_partition.test +++ b/mysql-test/suite/mariabackup/xb_partition.test @@ -1,3 +1,4 @@ +#--source include/innodb_page_size.inc --source include/have_partition.inc CREATE TABLE t1(a INT) ENGINE=InnoDB; @@ -68,9 +69,8 @@ INSERT INTO isam_p VALUES (401), (501); --disable_result_log exec $INNOBACKUPEX --defaults-file=$MYSQLTEST_VARDIR/my.cnf --incremental --no-timestamp --incremental-basedir=$targetdir/full $targetdir/inc; -exec $INNOBACKUPEX --defaults-file=$MYSQLTEST_VARDIR/my.cnf --apply-log --redo-only $targetdir/full; -exec $INNOBACKUPEX --defaults-file=$MYSQLTEST_VARDIR/my.cnf --apply-log --redo-only --incremental-dir=$targetdir/inc $targetdir/full; exec $INNOBACKUPEX --defaults-file=$MYSQLTEST_VARDIR/my.cnf --apply-log $targetdir/full; +exec $INNOBACKUPEX --defaults-file=$MYSQLTEST_VARDIR/my.cnf --apply-log --incremental-dir=$targetdir/inc $targetdir/full; let $targetdir=$targetdir/full; -- source include/restart_and_restore.inc diff --git a/mysql-test/suite/mariabackup/xbstream.test b/mysql-test/suite/mariabackup/xbstream.test index f2b4704a87e..9161d227b20 100644 --- a/mysql-test/suite/mariabackup/xbstream.test +++ b/mysql-test/suite/mariabackup/xbstream.test @@ -1,3 +1,5 @@ +--source include/innodb_page_size.inc + CREATE TABLE t(i INT) ENGINE INNODB; INSERT INTO t VALUES(1); diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index 9e3fc54290d..6f0218fcc88 100644 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@ -841,7 +841,7 @@ then rm -f "${DATA}/${IST_FILE}" # May need xtrabackup_checkpoints later on - rm -f ${DATA}/xtrabackup_binary ${DATA}/xtrabackup_galera_info ${DATA}/xtrabackup_logfile + rm -f ${DATA}/xtrabackup_binary ${DATA}/xtrabackup_galera_info ${DATA}/ib_logfile0 ADDR=${WSREP_SST_OPT_ADDR} if [ -z "${SST_PORT}" ] diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index 22aaa8a6f5d..c4da4b179be 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -188,3 +188,5 @@ IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") ) ENDIF() ENDIF() + +ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extra/mariabackup ${CMAKE_BINARY_DIR}/extra/mariabackup) diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 4ce1e7755e3..2ec76017ba0 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -326,13 +326,12 @@ fil_space_get_by_id( return(space); } -/*******************************************************************//** -Returns the table space by a given name, NULL if not found. */ -UNIV_INLINE +/** Look up a tablespace. +@param[in] name tablespace name +@return tablespace +@retval NULL if not found */ fil_space_t* -fil_space_get_by_name( -/*==================*/ - const char* name) /*!< in: space name */ +fil_space_get_by_name(const char* name) { fil_space_t* space; ulint fold; diff --git a/storage/innobase/fsp/fsp0file.cc b/storage/innobase/fsp/fsp0file.cc index 346962567d6..1b3bb93c488 100644 --- a/storage/innobase/fsp/fsp0file.cc +++ b/storage/innobase/fsp/fsp0file.cc @@ -334,6 +334,8 @@ Datafile::read_first_page(bool read_only_mode) break; + } else if (srv_operation == SRV_OPERATION_BACKUP) { + break; } else { ib::error() diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 3bfff324ae4..a1093fd24fd 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -407,7 +407,7 @@ static TYPELIB innodb_stats_method_typelib = { }; /** Possible values of the parameter innodb_checksum_algorithm */ -static const char* innodb_checksum_algorithm_names[] = { +const char* innodb_checksum_algorithm_names[] = { "crc32", "strict_crc32", "innodb", @@ -419,7 +419,7 @@ static const char* innodb_checksum_algorithm_names[] = { /** Used to define an enumerate type of the system variable innodb_checksum_algorithm. */ -static TYPELIB innodb_checksum_algorithm_typelib = { +TYPELIB innodb_checksum_algorithm_typelib = { array_elements(innodb_checksum_algorithm_names) - 1, "innodb_checksum_algorithm_typelib", innodb_checksum_algorithm_names, diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 8b87a5a2c90..bf231565657 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -849,6 +849,13 @@ public: return(m_space); } + /** Member accessor + @return the wrapped object */ + const fil_space_t* operator->() const + { + return(m_space); + } + /** Explicit type conversion @return the wrapped object */ const fil_space_t* operator()() const @@ -1526,6 +1533,13 @@ fil_space_get_by_id( /*================*/ ulint id); /*!< in: space id */ +/** Look up a tablespace. +@param[in] name tablespace name +@return tablespace +@retval NULL if not found */ +fil_space_t* +fil_space_get_by_name(const char* name); + /*******************************************************************//** by redo log. @param[in,out] space tablespace */ diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h index 1062a785fdb..543302c52f0 100644 --- a/storage/innobase/include/log0log.h +++ b/storage/innobase/include/log0log.h @@ -2,7 +2,7 @@ Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2009, Google Inc. -Copyright (c) 2017, MariaDB Corporation. All Rights Reserved. +Copyright (c) 2017, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -39,6 +39,7 @@ Created 12/9/1995 Heikki Tuuri #include "sync0rw.h" #include "log0types.h" #include "os0event.h" +#include "os0file.h" /** Redo log group */ struct log_group_t; @@ -575,6 +576,12 @@ struct log_group_t{ { return((format & LOG_HEADER_FORMAT_ENCRYPTED) != 0); } + + /** @return capacity in bytes */ + inline lsn_t capacity() const + { + return((file_size - LOG_FILE_HDR_SIZE) * n_files); + } }; /** Redo log buffer */ diff --git a/storage/innobase/include/log0log.ic b/storage/innobase/include/log0log.ic index 1e09c263975..f743985147c 100644 --- a/storage/innobase/include/log0log.ic +++ b/storage/innobase/include/log0log.ic @@ -24,7 +24,6 @@ Database log Created 12/9/1995 Heikki Tuuri *******************************************************/ -#include "os0file.h" #include "mach0data.h" #include "srv0mon.h" #include "srv0srv.h" diff --git a/storage/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h index bacfb86cc07..744ad79f589 100644 --- a/storage/innobase/include/log0recv.h +++ b/storage/innobase/include/log0recv.h @@ -92,6 +92,20 @@ Frees the recovery system. */ void recv_sys_debug_free(void); /*=====================*/ + +/** Read a log segment to a buffer. +@param[out] buf buffer +@param[in] group redo log files +@param[in] start_lsn read area start +@param[in] end_lsn read area end +@return valid end_lsn */ +lsn_t +log_group_read_log_seg( + byte* buf, + const log_group_t* group, + lsn_t start_lsn, + lsn_t end_lsn); + /********************************************************//** Reset the state of the recovery system variables. */ void diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index 4ee8962a0c7..891f25f68f1 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -500,6 +500,19 @@ extern ulong srv_max_purge_lag_delay; extern ulong srv_replication_delay; /*-------------------------------------------*/ +/** Modes of operation */ +enum srv_operation_mode { + /** Normal mode (MariaDB Server) */ + SRV_OPERATION_NORMAL, + /** Mariabackup taking a backup */ + SRV_OPERATION_BACKUP, + /** Mariabackup restoring a backup */ + SRV_OPERATION_RESTORE +}; + +/** Current mode of operation */ +extern enum srv_operation_mode srv_operation; + extern my_bool srv_print_innodb_monitor; extern my_bool srv_print_innodb_lock_monitor; extern ibool srv_print_verbose_log; diff --git a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h index 93ea0be2662..3575f2e40b9 100644 --- a/storage/innobase/include/srv0start.h +++ b/storage/innobase/include/srv0start.h @@ -38,6 +38,12 @@ struct dict_table_t; only one buffer pool instance is used. */ #define BUF_POOL_SIZE_THRESHOLD (1024 * 1024 * 1024) +/** Open the configured number of dedicated undo tablespaces. +@param[in] create_new_db whether the database is being initialized +@return DB_SUCCESS or error code */ +dberr_t +srv_undo_tablespaces_init(bool create_new_db); + /****************************************************************//** Starts Innobase and creates a new database if database files are not found and the user wants. @@ -127,4 +133,7 @@ extern bool srv_undo_sources; /** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to SRV_SHUTDOWN_CLEANUP and then to SRV_SHUTDOWN_LAST_PHASE, and so on */ extern enum srv_shutdown_t srv_shutdown_state; + +/** Files comprising the system tablespace */ +extern pfs_os_file_t files[1000]; #endif diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 88c13be5a8f..da4db5b9435 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -618,7 +618,7 @@ Windows, so define a typedef for it and a macro to use at the end of such functions. */ #ifdef _WIN32 -typedef ulint os_thread_ret_t; +typedef DWORD os_thread_ret_t; # define OS_THREAD_DUMMY_RETURN return(0) # define OS_PATH_SEPARATOR '\\' # define OS_PATH_SEPARATOR_ALT '/' diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 182df269015..2e8d8233fd5 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -548,23 +548,6 @@ function_exit: return(lsn); } -/******************************************************//** -Calculates the data capacity of a log group, when the log file headers are not -included. -@return capacity in bytes */ -static -lsn_t -log_group_get_capacity( -/*===================*/ - const log_group_t* group) /*!< in: log group */ -{ - /* The lsn parameters are updated while holding both the mutexes - and it is ok to have either of them while reading */ - ut_ad(log_mutex_own() || log_write_mutex_own()); - - return((group->file_size - LOG_FILE_HDR_SIZE) * group->n_files); -} - /******************************************************//** Calculates the offset within a log group, when the log file headers are not included. @@ -628,7 +611,7 @@ log_group_calc_lsn_offset( gr_lsn_size_offset = log_group_calc_size_offset( group->lsn_offset, group); - group_size = log_group_get_capacity(group); + group_size = group->capacity(); if (lsn >= gr_lsn) { diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 11f3f05acab..81c60922d71 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -640,7 +640,6 @@ recv_sys_debug_free(void) @param[in] start_lsn read area start @param[in] end_lsn read area end @return valid end_lsn */ -static lsn_t log_group_read_log_seg( byte* buf, @@ -1931,27 +1930,29 @@ recv_read_in_area( void recv_apply_hashed_log_recs(bool last_batch) { - for (;;) { - mutex_enter(&recv_sys->mutex); + ut_ad(srv_operation == SRV_OPERATION_NORMAL + || srv_operation == SRV_OPERATION_RESTORE); - if (!recv_sys->apply_batch_on) { - break; - } + mutex_enter(&recv_sys->mutex); - if (recv_sys->found_corrupt_log) { - mutex_exit(&recv_sys->mutex); + while (recv_sys->apply_batch_on) { + bool abort = recv_sys->found_corrupt_log; + mutex_exit(&recv_sys->mutex); + + if (abort) { return; } - mutex_exit(&recv_sys->mutex); os_thread_sleep(500000); + mutex_enter(&recv_sys->mutex); } ut_ad(!last_batch == log_mutex_own()); - if (!last_batch) { - recv_no_ibuf_operations = true; - } + recv_no_ibuf_operations = !last_batch + || srv_operation == SRV_OPERATION_RESTORE; + + ut_d(recv_no_log_write = recv_no_ibuf_operations); if (ulint n = recv_sys->n_addrs) { const char* msg = last_batch @@ -2023,10 +2024,11 @@ recv_apply_hashed_log_recs(bool last_batch) /* Wait until all the pages have been processed */ while (recv_sys->n_addrs != 0) { + bool abort = recv_sys->found_corrupt_log; mutex_exit(&(recv_sys->mutex)); - if (recv_sys->found_corrupt_log) { + if (abort) { return; } @@ -2039,7 +2041,6 @@ recv_apply_hashed_log_recs(bool last_batch) /* Flush all the file pages to disk and invalidate them in the buffer pool */ - ut_d(recv_no_log_write = true); mutex_exit(&(recv_sys->mutex)); log_mutex_exit(); @@ -2062,9 +2063,6 @@ recv_apply_hashed_log_recs(bool last_batch) log_mutex_enter(); mutex_enter(&(recv_sys->mutex)); - ut_d(recv_no_log_write = false); - - recv_no_ibuf_operations = false; } recv_sys->apply_log_recs = FALSE; @@ -2414,6 +2412,13 @@ loop: recv_sys->recovered_lsn); } /* fall through */ + case MLOG_INDEX_LOAD: + /* Mariabackup FIXME: Report an error + when encountering MLOG_INDEX_LOAD on + --prepare or already on --backup. */ + ut_a(type != MLOG_INDEX_LOAD + || srv_operation == SRV_OPERATION_NORMAL); + /* fall through */ case MLOG_FILE_NAME: case MLOG_FILE_DELETE: case MLOG_FILE_CREATE2: @@ -2422,7 +2427,6 @@ loop: /* These were already handled by recv_parse_log_rec() and recv_parse_or_apply_log_rec_body(). */ - case MLOG_INDEX_LOAD: DBUG_PRINT("ib_log", ("scan " LSN_PF ": log rec %s" " len " ULINTPF @@ -2560,11 +2564,16 @@ loop: for something else. */ break; #endif /* UNIV_LOG_LSN_DEBUG */ + case MLOG_INDEX_LOAD: + /* Mariabackup FIXME: Report an error + when encountering MLOG_INDEX_LOAD on + --prepare or already on --backup. */ + ut_a(srv_operation == SRV_OPERATION_NORMAL); + break; case MLOG_FILE_NAME: case MLOG_FILE_DELETE: case MLOG_FILE_CREATE2: case MLOG_FILE_RENAME2: - case MLOG_INDEX_LOAD: case MLOG_TRUNCATE: /* These were already handled by recv_parse_log_rec() and @@ -2960,6 +2969,14 @@ static dberr_t recv_init_missing_space(dberr_t err, const recv_spaces_t::const_iterator& i) { + if (srv_operation == SRV_OPERATION_RESTORE) { + ib::warn() << "Tablespace " << i->first << " was not" + " found at " << i->second.name << " when" + " restoring a (partial?) backup. All redo log" + " for this file will be ignored!"; + return(err); + } + if (srv_force_recovery == 0) { ib::error() << "Tablespace " << i->first << " was not" " found at " << i->second.name << "."; diff --git a/storage/innobase/mtr/mtr0mtr.cc b/storage/innobase/mtr/mtr0mtr.cc index 54b9ff5d8d8..e050694bb86 100644 --- a/storage/innobase/mtr/mtr0mtr.cc +++ b/storage/innobase/mtr/mtr0mtr.cc @@ -557,7 +557,7 @@ mtr_t::commit() m_impl.m_state = MTR_STATE_COMMITTING; /* This is a dirty read, for debugging. */ - ut_ad(!recv_no_log_write); + ut_ad(!m_impl.m_modifications || !recv_no_log_write); Command cmd(this); diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index bb8a35bf2a4..2acb190f7e4 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -3796,6 +3796,7 @@ os_file_create_simple_func( ut_a(!(create_mode & OS_FILE_ON_ERROR_SILENT)); ut_a(!(create_mode & OS_FILE_ON_ERROR_NO_EXIT)); + ut_ad(srv_operation == SRV_OPERATION_NORMAL); if (create_mode == OS_FILE_OPEN) { @@ -4119,7 +4120,9 @@ os_file_create_func( ); DWORD create_flag; - DWORD share_mode = FILE_SHARE_READ; + DWORD share_mode = srv_operation != SRV_OPERATION_NORMAL + ? FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE + : FILE_SHARE_READ; if (create_mode != OS_FILE_OPEN && create_mode != OS_FILE_OPEN_RAW) { WAIT_ALLOW_WRITES(); @@ -4131,8 +4134,7 @@ os_file_create_func( on_error_silent = create_mode & OS_FILE_ON_ERROR_SILENT ? true : false; - create_mode &= ~OS_FILE_ON_ERROR_NO_EXIT; - create_mode &= ~OS_FILE_ON_ERROR_SILENT; + create_mode &= ~(OS_FILE_ON_ERROR_NO_EXIT | OS_FILE_ON_ERROR_SILENT); if (create_mode == OS_FILE_OPEN_RAW) { @@ -4325,7 +4327,9 @@ os_file_create_simple_no_error_handling_func( DWORD access; DWORD create_flag; DWORD attributes = 0; - DWORD share_mode = FILE_SHARE_READ; + DWORD share_mode = srv_operation != SRV_OPERATION_NORMAL + ? FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE + : FILE_SHARE_READ; ut_a(name); @@ -4374,7 +4378,8 @@ os_file_create_simple_no_error_handling_func( /*!< A backup program has to give mysqld the maximum freedom to do what it likes with the file */ - share_mode |= FILE_SHARE_DELETE | FILE_SHARE_WRITE; + share_mode |= FILE_SHARE_DELETE | FILE_SHARE_WRITE + | FILE_SHARE_READ; } else { ib::error() @@ -4676,7 +4681,8 @@ os_file_get_status_win32( fh = CreateFile( (LPCTSTR) path, // File to open access, - 0, // No sharing + FILE_SHARE_READ | FILE_SHARE_WRITE + | FILE_SHARE_DELETE, // Full sharing NULL, // Default security OPEN_EXISTING, // Existing file only FILE_ATTRIBUTE_NORMAL, // Normal file diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 53009ca7621..2894be6b12c 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -446,6 +446,9 @@ UNIV_INTERN uint srv_defragment_frequency; @see innodb_defragment_frequency_update() */ UNIV_INTERN ulonglong srv_defragment_interval; +/** Current mode of operation */ +UNIV_INTERN enum srv_operation_mode srv_operation; + /* Set the following to 0 if you want InnoDB to write messages on stderr on startup/shutdown. Not enabled on the embedded server. */ ibool srv_print_verbose_log; diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 072a5c67bc7..6068b48e0cb 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -184,7 +184,7 @@ SRV_SHUTDOWN_CLEANUP and then to SRV_SHUTDOWN_LAST_PHASE, and so on */ enum srv_shutdown_t srv_shutdown_state = SRV_SHUTDOWN_NONE; /** Files comprising the system tablespace */ -static pfs_os_file_t files[1000]; +pfs_os_file_t files[1000]; /** io_handler_thread parameters for thread identification */ static ulint n[SRV_MAX_N_IO_THREADS + 6]; @@ -395,6 +395,29 @@ create_log_file( /** Initial number of the first redo log file */ #define INIT_LOG_FILE0 (SRV_N_LOG_FILES_MAX + 1) +/** Delete all log files. +@param[in,out] logfilename buffer for log file name +@param[in] dirnamelen length of the directory path +@param[in] n_files number of files to delete */ +static +void +delete_log_files(char* logfilename, size_t dirnamelen, unsigned n_files) +{ + /* Remove any old log files. */ + for (unsigned i = 0; i < n_files; i++) { + sprintf(logfilename + dirnamelen, "ib_logfile%u", i); + + /* Ignore errors about non-existent files or files + that cannot be removed. The create_log_file() will + return an error when the file exists. */ +#ifdef _WIN32 + DeleteFile((LPCTSTR) logfilename); +#else + unlink(logfilename); +#endif + } +} + /*********************************************************************//** Creates all log files. @return DB_SUCCESS or error code */ @@ -414,24 +437,14 @@ create_log_files( return(DB_READ_ONLY); } - /* Remove any old log files. */ - for (unsigned i = 0; i <= INIT_LOG_FILE0; i++) { - sprintf(logfilename + dirnamelen, "ib_logfile%u", i); + /* Crashing after deleting the first file should be + recoverable. The buffer pool was clean, and we can simply + create all log files from the scratch. */ + DBUG_EXECUTE_IF("innodb_log_abort_6", + delete_log_files(logfilename, dirnamelen, 1); + return(DB_ERROR);); - /* Ignore errors about non-existent files or files - that cannot be removed. The create_log_file() will - return an error when the file exists. */ -#ifdef _WIN32 - DeleteFile((LPCTSTR) logfilename); -#else - unlink(logfilename); -#endif - /* Crashing after deleting the first - file should be recoverable. The buffer - pool was clean, and we can simply create - all log files from the scratch. */ - DBUG_EXECUTE_IF("innodb_log_abort_6", return(DB_ERROR);); - } + delete_log_files(logfilename, dirnamelen, INIT_LOG_FILE0 + 1); DBUG_PRINT("ib_log", ("After innodb_log_abort_6")); ut_ad(!buf_pool_check_no_pending_io()); @@ -820,7 +833,6 @@ undo::undo_spaces_t undo::Truncate::s_fix_up_spaces; /** Open the configured number of dedicated undo tablespaces. @param[in] create_new_db whether the database is being initialized @return DB_SUCCESS or error code */ -static dberr_t srv_undo_tablespaces_init(bool create_new_db) { @@ -833,6 +845,7 @@ srv_undo_tablespaces_init(bool create_new_db) srv_undo_tablespaces_open = 0; ut_a(srv_undo_tablespaces <= TRX_SYS_N_RSEGS); + ut_a(!create_new_db || srv_operation == SRV_OPERATION_NORMAL); memset(undo_tablespace_ids, 0x0, sizeof(undo_tablespace_ids)); @@ -878,7 +891,7 @@ srv_undo_tablespaces_init(bool create_new_db) we build the undo_tablespace_ids ourselves since they don't already exist. */ - if (!create_new_db) { + if (!create_new_db && srv_operation == SRV_OPERATION_NORMAL) { n_undo_tablespaces = trx_rseg_get_n_undo_tablespaces( undo_tablespace_ids); @@ -1289,8 +1302,15 @@ srv_shutdown_all_bg_threads() } } - if (!buf_page_cleaner_is_active && os_aio_all_slots_free()) { - os_aio_wake_all_threads_at_shutdown(); + switch (srv_operation) { + case SRV_OPERATION_BACKUP: + break; + case SRV_OPERATION_NORMAL: + case SRV_OPERATION_RESTORE: + if (!buf_page_cleaner_is_active + && os_aio_all_slots_free()) { + os_aio_wake_all_threads_at_shutdown(); + } } if (!os_thread_count) { @@ -1461,6 +1481,9 @@ innobase_start_or_create_for_mysql() size_t dirnamelen; unsigned i = 0; + ut_ad(srv_operation == SRV_OPERATION_NORMAL + || srv_operation == SRV_OPERATION_RESTORE); + if (srv_force_recovery == SRV_FORCE_NO_LOG_REDO) { srv_read_only_mode = true; } @@ -1960,6 +1983,10 @@ innobase_start_or_create_for_mysql() if (err == DB_NOT_FOUND) { if (i == 0) { + if (srv_operation + == SRV_OPERATION_RESTORE) { + return(DB_SUCCESS); + } if (flushed_lsn < static_cast(1000)) { ib::error() @@ -2306,6 +2333,26 @@ files_checked: recv_recovery_from_checkpoint_finish(); + if (srv_operation == SRV_OPERATION_RESTORE) { + /* After applying the redo log from + SRV_OPERATION_BACKUP, flush the changes + to the data files and delete the log file. + No further change to InnoDB files is needed. */ + ut_ad(!srv_force_recovery); + ut_ad(srv_n_log_files_found <= 1); + ut_ad(recv_no_log_write); + buf_flush_sync_all_buf_pools(); + err = fil_write_flushed_lsn(log_get_lsn()); + ut_ad(!buf_pool_check_no_pending_io()); + fil_close_log_files(true); + log_group_close_all(); + if (err == DB_SUCCESS) { + delete_log_files(logfilename, dirnamelen, + srv_n_log_files_found); + } + return(err); + } + /* Upgrade or resize or rebuild the redo logs before generating any dirty pages, so that the old redo log files will not be written to. */ @@ -2559,7 +2606,7 @@ files_checked: return(srv_init_abort(err)); } - if (!srv_read_only_mode) { + if (!srv_read_only_mode && srv_operation == SRV_OPERATION_NORMAL) { /* Initialize the innodb_temporary tablespace and keep it open until shutdown. */ err = srv_open_tmp_tablespace(create_new_db); @@ -2586,7 +2633,7 @@ files_checked: srv_start_state_set(SRV_START_STATE_MASTER); } - if (!srv_read_only_mode + if (!srv_read_only_mode && srv_operation == SRV_OPERATION_NORMAL && srv_force_recovery < SRV_FORCE_NO_BACKGROUND) { srv_undo_sources = true; /* Create the dict stats gathering thread */ @@ -2770,13 +2817,20 @@ innodb_shutdown() ut_ad(!srv_running); ut_ad(!srv_undo_sources); - /* Shut down the persistent files. */ - logs_empty_and_mark_files_at_shutdown(); + switch (srv_operation) { + case SRV_OPERATION_BACKUP: + case SRV_OPERATION_RESTORE: + fil_close_all_files(); + break; + case SRV_OPERATION_NORMAL: + /* Shut down the persistent files. */ + logs_empty_and_mark_files_at_shutdown(); - if (ulint n_threads = srv_conc_get_active_threads()) { - ib::warn() << "Query counter shows " - << n_threads << " queries still" - " inside InnoDB at shutdown"; + if (ulint n_threads = srv_conc_get_active_threads()) { + ib::warn() << "Query counter shows " + << n_threads << " queries still" + " inside InnoDB at shutdown"; + } } /* Exit any remaining threads. */ From e417af2cb8ee615ba3b0a3f557797271e7bf7c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 5 Jul 2017 12:45:15 +0300 Subject: [PATCH 053/102] MDEV-13143 Server crashes in srv_init_abort_low() when started with inaccessible tmpdir This is a regression caused by commit bb60a832ede139d24a2470a1b1217d30799d726e srv_shutdown_all_bg_threads(): If os_thread_count indicates that no threads are running, do not bother checking thread status. This avoids a crash when InnoDB startup is aborted before os_aio_init() has been invoked. (os_aio_all_slots_free() would dereference AIO::s_reads even though it is NULL.) --- .../suite/innodb/r/temporary_table.result | 2 ++ .../suite/innodb/t/temporary_table.test | 31 +++++++++++++++++++ storage/innobase/srv/srv0start.cc | 8 ++--- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/innodb/r/temporary_table.result b/mysql-test/suite/innodb/r/temporary_table.result index 074dd413947..689d5a530d2 100644 --- a/mysql-test/suite/innodb/r/temporary_table.result +++ b/mysql-test/suite/innodb/r/temporary_table.result @@ -137,6 +137,8 @@ Tables_in_test create temporary table t1 (keyc int, c1 char(100), c2 char(100)) engine = innodb; ERROR HY000: Can't create table `test`.`t1` (errno: 165 "Table is read only") # test various bad start-up parameters +FOUND 3 /Can't create/write to file '.dev.null.nonexistent.ib/ in mysqld.1.err +FOUND 3 /InnoDB: Unable to create temporary file/ in mysqld.1.err FOUND 1 /innodb_temporary and innodb_system file names seem to be the same/ in mysqld.1.err SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); diff --git a/mysql-test/suite/innodb/t/temporary_table.test b/mysql-test/suite/innodb/t/temporary_table.test index 1148f2ee1a0..45f84834edb 100644 --- a/mysql-test/suite/innodb/t/temporary_table.test +++ b/mysql-test/suite/innodb/t/temporary_table.test @@ -10,6 +10,8 @@ --source include/no_valgrind_without_big.inc --disable_query_log +call mtr.add_suppression("Can't create/write to file '.dev.null.nonexistent.ib"); +call mtr.add_suppression("InnoDB: Unable to create temporary file"); call mtr.add_suppression("last file in setting innodb_temp_data_file_path"); call mtr.add_suppression("The table 't1' is full"); call mtr.add_suppression("Plugin 'InnoDB' init function returned error"); @@ -125,6 +127,35 @@ let SEARCH_ABORT = NOT FOUND; let $check_no_innodb=SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); +# We cannot use include/restart_mysqld.inc in this particular test, +# because SHOW STATUS would fail due to unwritable (nonexistent) tmpdir. +--source include/shutdown_mysqld.inc +--exec echo "restart: --tmpdir=/dev/null/nonexistent" > $_expect_file_name +--enable_reconnect +--disable_result_log +--disable_query_log +let $counter= 5000; +let $mysql_errno= 9999; +while ($mysql_errno) +{ + --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013 + select 1; + + dec $counter; + if (!$counter) + { + --die Server failed to restart + } + --sleep 0.1 +} +--enable_query_log +--enable_result_log +--disable_reconnect +--let SEARCH_PATTERN= Can't create/write to file '.dev.null.nonexistent.ib +--source include/search_pattern_in_file.inc +--let SEARCH_PATTERN= InnoDB: Unable to create temporary file +--source include/search_pattern_in_file.inc + --let $restart_parameters= --innodb_data_file_path=ibdata1:12M:autoextend --innodb_temp_data_file_path=ibdata1:12M:autoextend --source include/restart_mysqld.inc --let SEARCH_PATTERN = innodb_temporary and innodb_system file names seem to be the same diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 6068b48e0cb..64ddb5a7ec5 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -1302,6 +1302,10 @@ srv_shutdown_all_bg_threads() } } + if (!os_thread_count) { + return; + } + switch (srv_operation) { case SRV_OPERATION_BACKUP: break; @@ -1313,10 +1317,6 @@ srv_shutdown_all_bg_threads() } } - if (!os_thread_count) { - return; - } - os_thread_sleep(100000); } From c5a525bda2b64dd008598afa51f3b7c6347e24fc Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 5 Jul 2017 10:55:36 +0000 Subject: [PATCH 054/102] mariabackup : debian packaging --- debian/control | 10 ++++++++++ ...adb-backup-10.1.files => mariadb-backup-10.2.files} | 0 2 files changed, 10 insertions(+) rename debian/{mariadb-backup-10.1.files => mariadb-backup-10.2.files} (100%) diff --git a/debian/control b/debian/control index 722e88593cf..eba70224773 100644 --- a/debian/control +++ b/debian/control @@ -553,6 +553,16 @@ Breaks: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2 Replaces: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2 Description: GSSAPI authentication plugin for MariaDB client +Package: mariadb-backup-10.2 +Section: database +Architecture: any +Breaks: mariadb-backup-10.1 +Replaces: mariadb-backup-10.1 +Depends: mariadb-server-10.2, + ${misc:Depends}, + ${shlibs:Depends} +Description: Backup tool for MariaDB server + Package: mariadb-plugin-cracklib-password-check Architecture: any Depends: libcrack2 (>= 2.9.0), diff --git a/debian/mariadb-backup-10.1.files b/debian/mariadb-backup-10.2.files similarity index 100% rename from debian/mariadb-backup-10.1.files rename to debian/mariadb-backup-10.2.files From f2931b1e3acbd4d7ffdfac75e27efce1ea19583b Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 5 Jul 2017 11:33:04 +0000 Subject: [PATCH 055/102] mariabackup : run tests on buildbot on Windows --- mysql-test/collections/buildbot_suites.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/collections/buildbot_suites.bat b/mysql-test/collections/buildbot_suites.bat index f91692d2918..89e68919c7f 100644 --- a/mysql-test/collections/buildbot_suites.bat +++ b/mysql-test/collections/buildbot_suites.bat @@ -2,4 +2,5 @@ perl mysql-test-run.pl --verbose-restart --force --testcase-timeout=45 --suite-t main,^ innodb,^ plugins,^ +mariabackup,^ rocksdb From e3d3147792ebe56cbdd8ab52f123bed36e85e00c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 5 Jul 2017 14:35:55 +0300 Subject: [PATCH 056/102] MDEV-13105 InnoDB fails to load a table with PAGE_COMPRESSION_LEVEL after upgrade from 10.1.20 When using innodb_page_size=16k, InnoDB tables that were created in MariaDB 10.1.0 to 10.1.20 with PAGE_COMPRESSED=1 and PAGE_COMPRESSION_LEVEL=2 or PAGE_COMPRESSION_LEVEL=3 would fail to load. fsp_flags_is_valid(): When using innodb_page_size=16k, use a more strict check for .ibd files, with the assumption that nobody would try to use different-page-size files. --- extra/mariabackup/fil_cur.cc | 2 +- mysql-test/suite/innodb/include/ibd_convert.pl | 2 +- mysql-test/suite/innodb/r/101_compatibility.result | 2 +- mysql-test/suite/innodb/t/101_compatibility.test | 2 +- storage/innobase/buf/buf0dblwr.cc | 2 +- storage/innobase/fil/fil0fil.cc | 12 ++++++------ storage/innobase/fsp/fsp0file.cc | 10 ++++------ storage/innobase/fsp/fsp0fsp.cc | 2 +- storage/innobase/include/dict0dict.ic | 2 +- storage/innobase/include/fsp0fsp.h | 4 ++-- storage/innobase/include/fsp0space.h | 2 +- storage/innobase/include/fsp0types.h | 10 ++++++++-- storage/innobase/row/row0import.cc | 2 +- 13 files changed, 29 insertions(+), 25 deletions(-) diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc index 9df5f8e8fa3..b733f98457e 100644 --- a/extra/mariabackup/fil_cur.cc +++ b/extra/mariabackup/fil_cur.cc @@ -219,7 +219,7 @@ xb_fil_cur_open( return(XB_FIL_CUR_SKIP); } - if (!fsp_flags_is_valid(flags)) { + if (!fsp_flags_is_valid(flags, cursor->space_id)) { ulint cflags = fsp_flags_convert_from_101(flags); if (cflags == ULINT_UNDEFINED) { msg("[%02u] xtrabackup: Error: Invalid " diff --git a/mysql-test/suite/innodb/include/ibd_convert.pl b/mysql-test/suite/innodb/include/ibd_convert.pl index 9c7e829f455..bb9dfbe74b8 100644 --- a/mysql-test/suite/innodb/include/ibd_convert.pl +++ b/mysql-test/suite/innodb/include/ibd_convert.pl @@ -11,7 +11,7 @@ sub convert_to_mariadb_101 # FIL_PAGE_DATA + FSP_SPACE_FLAGS = 38 + 16 = 54 bytes from the start my($flags) = unpack "x[54]N", $_; my $badflags = ($flags & 0x3f); - my $compression_level=6; + my $compression_level=3; $badflags |= 1<<6|$compression_level<<7 if ($flags & 1 << 16); $badflags |= ($flags & 15 << 6) << 7; # PAGE_SSIZE diff --git a/mysql-test/suite/innodb/r/101_compatibility.result b/mysql-test/suite/innodb/r/101_compatibility.result index bc4d37916df..a1ca493a6b2 100644 --- a/mysql-test/suite/innodb/r/101_compatibility.result +++ b/mysql-test/suite/innodb/r/101_compatibility.result @@ -9,7 +9,7 @@ SET INNODB_STRICT_MODE=OFF; CREATE TABLE tz(a INT)ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1; SET INNODB_STRICT_MODE=ON; CREATE TABLE tdd(a INT) ENGINE=InnoDB, DATA DIRECTORY='MYSQL_TMP_DIR'; -CREATE TABLE tp(a INT) ENGINE=InnoDB page_compressed=1; +CREATE TABLE tp(a INT) ENGINE=InnoDB ROW_FORMAT=DYNAMIC PAGE_COMPRESSED=1; CREATE TABLE ti(a INT) ENGINE=InnoDB; FLUSH TABLES ti FOR EXPORT; backup: ti diff --git a/mysql-test/suite/innodb/t/101_compatibility.test b/mysql-test/suite/innodb/t/101_compatibility.test index 78dee53e52f..eb3d3b0c014 100644 --- a/mysql-test/suite/innodb/t/101_compatibility.test +++ b/mysql-test/suite/innodb/t/101_compatibility.test @@ -29,7 +29,7 @@ SET INNODB_STRICT_MODE=ON; --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR EVAL CREATE TABLE tdd(a INT) ENGINE=InnoDB, DATA DIRECTORY='$MYSQL_TMP_DIR'; -CREATE TABLE tp(a INT) ENGINE=InnoDB page_compressed=1; +CREATE TABLE tp(a INT) ENGINE=InnoDB ROW_FORMAT=DYNAMIC PAGE_COMPRESSED=1; CREATE TABLE ti(a INT) ENGINE=InnoDB; FLUSH TABLES ti FOR EXPORT; perl; diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc index b770e8483d9..17b2229f1da 100644 --- a/storage/innobase/buf/buf0dblwr.cc +++ b/storage/innobase/buf/buf0dblwr.cc @@ -659,7 +659,7 @@ buf_dblwr_process() if (page_no == 0) { /* Check the FSP_SPACE_FLAGS. */ ulint flags = fsp_header_get_flags(page); - if (!fsp_flags_is_valid(flags) + if (!fsp_flags_is_valid(flags, space_id) && fsp_flags_convert_from_101(flags) == ULINT_UNDEFINED) { ib::warn() << "Ignoring a doublewrite copy" diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 2ec76017ba0..fec7405cb6d 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -663,7 +663,7 @@ retry: ut_free(buf2); os_file_close(node->handle); - if (!fsp_flags_is_valid(flags)) { + if (!fsp_flags_is_valid(flags, space->id)) { ulint cflags = fsp_flags_convert_from_101(flags); if (cflags == ULINT_UNDEFINED) { ib::error() @@ -1601,7 +1601,7 @@ fil_space_create( fil_space_t* space; ut_ad(fil_system); - ut_ad(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK)); + ut_ad(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK, id)); ut_ad(purpose == FIL_TYPE_LOG || srv_page_size == UNIV_PAGE_SIZE_ORIG || flags != 0); @@ -2388,7 +2388,7 @@ fil_op_write_log( ulint len; ut_ad(first_page_no == 0); - ut_ad(fsp_flags_is_valid(flags)); + ut_ad(fsp_flags_is_valid(flags, space_id)); /* fil_name_parse() requires that there be at least one path separator and that the file path end with ".ibd". */ @@ -3794,7 +3794,7 @@ fil_ibd_create( ut_ad(!srv_read_only_mode); ut_a(space_id < SRV_LOG_SPACE_FIRST_ID); ut_a(size >= FIL_IBD_FILE_INITIAL_SIZE); - ut_a(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK)); + ut_a(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK, space_id)); /* Create the subdirectories in the path, if they are not there already. */ @@ -4089,7 +4089,7 @@ fil_ibd_open( return(DB_CORRUPTION); } - ut_ad(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK)); + ut_ad(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK, id)); df_default.init(space_name, flags); df_dict.init(space_name, flags); df_remote.init(space_name, flags); @@ -4737,7 +4737,7 @@ void fsp_flags_try_adjust(ulint space_id, ulint flags) { ut_ad(!srv_read_only_mode); - ut_ad(fsp_flags_is_valid(flags)); + ut_ad(fsp_flags_is_valid(flags, space_id)); mtr_t mtr; mtr.start(); diff --git a/storage/innobase/fsp/fsp0file.cc b/storage/innobase/fsp/fsp0file.cc index 1b3bb93c488..4f03ace9d8e 100644 --- a/storage/innobase/fsp/fsp0file.cc +++ b/storage/innobase/fsp/fsp0file.cc @@ -353,7 +353,7 @@ Datafile::read_first_page(bool read_only_mode) if (m_order == 0) { m_space_id = fsp_header_get_space_id(m_first_page); m_flags = fsp_header_get_flags(m_first_page); - if (!fsp_flags_is_valid(m_flags)) { + if (!fsp_flags_is_valid(m_flags, m_space_id)) { ulint cflags = fsp_flags_convert_from_101(m_flags); if (cflags == ULINT_UNDEFINED) { ib::error() @@ -524,9 +524,7 @@ Datafile::validate_first_page(lsn_t* flush_lsn) } /* Check if the whole page is blank. */ - if (error_txt == NULL - && m_space_id == srv_sys_space.space_id() - && !m_flags) { + if (error_txt == NULL && !m_space_id && !m_flags) { const byte* b = m_first_page; ulint nonzero_bytes = UNIV_PAGE_SIZE; @@ -558,7 +556,7 @@ Datafile::validate_first_page(lsn_t* flush_lsn) free_first_page(); return(DB_ERROR); - } else if (!fsp_flags_is_valid(m_flags)) { + } else if (!fsp_flags_is_valid(m_flags, m_space_id)) { /* Tablespace flags must be valid. */ error_txt = "Tablespace flags are invalid"; } else if (page_get_page_no(m_first_page) != 0) { @@ -799,7 +797,7 @@ Datafile::restore_from_doublewrite() ulint flags = mach_read_from_4( FSP_HEADER_OFFSET + FSP_SPACE_FLAGS + page); - if (!fsp_flags_is_valid(flags)) { + if (!fsp_flags_is_valid(flags, m_space_id)) { ulint cflags = fsp_flags_convert_from_101(flags); if (cflags == ULINT_UNDEFINED) { ib::warn() diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc index bf86d83a8c7..33b237bd488 100644 --- a/storage/innobase/fsp/fsp0fsp.cc +++ b/storage/innobase/fsp/fsp0fsp.cc @@ -682,7 +682,7 @@ fsp_header_init_fields( ulint flags) /*!< in: tablespace flags (FSP_SPACE_FLAGS) */ { flags &= ~FSP_FLAGS_MEM_MASK; - ut_a(fsp_flags_is_valid(flags)); + ut_a(fsp_flags_is_valid(flags, space_id)); mach_write_to_4(FSP_HEADER_OFFSET + FSP_SPACE_ID + page, space_id); diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic index 0244bb784e0..9aaf506b2e3 100644 --- a/storage/innobase/include/dict0dict.ic +++ b/storage/innobase/include/dict0dict.ic @@ -878,7 +878,7 @@ dict_tf_to_fsp_flags(ulint table_flags) fsp_flags |= FSP_FLAGS_MASK_PAGE_COMPRESSION; } - ut_a(fsp_flags_is_valid(fsp_flags)); + ut_a(fsp_flags_is_valid(fsp_flags, false)); if (DICT_TF_HAS_DATA_DIR(table_flags)) { fsp_flags |= 1U << FSP_FLAGS_MEM_DATA_DIR; diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h index 63fc211c88d..f9167e0462e 100644 --- a/storage/innobase/include/fsp0fsp.h +++ b/storage/innobase/include/fsp0fsp.h @@ -779,7 +779,7 @@ fsp_flags_convert_from_101(ulint flags) flags = ((flags & 0x3f) | ssize << FSP_FLAGS_POS_PAGE_SSIZE | FSP_FLAGS_GET_PAGE_COMPRESSION_MARIADB101(flags) << FSP_FLAGS_POS_PAGE_COMPRESSION); - ut_ad(fsp_flags_is_valid(flags)); + ut_ad(fsp_flags_is_valid(flags, false)); return(flags); } @@ -793,7 +793,7 @@ bool fsp_flags_match(ulint expected, ulint actual) { expected &= ~FSP_FLAGS_MEM_MASK; - ut_ad(fsp_flags_is_valid(expected)); + ut_ad(fsp_flags_is_valid(expected, false)); if (actual == expected) { return(true); diff --git a/storage/innobase/include/fsp0space.h b/storage/innobase/include/fsp0space.h index 2c28ecc5c7b..9f869fda158 100644 --- a/storage/innobase/include/fsp0space.h +++ b/storage/innobase/include/fsp0space.h @@ -129,7 +129,7 @@ public: @param[in] fsp_flags tablespace flags */ void set_flags(ulint fsp_flags) { - ut_ad(fsp_flags_is_valid(fsp_flags)); + ut_ad(fsp_flags_is_valid(fsp_flags, false)); m_flags = fsp_flags; } diff --git a/storage/innobase/include/fsp0types.h b/storage/innobase/include/fsp0types.h index 129fd102f0f..c6dbe52def4 100644 --- a/storage/innobase/include/fsp0types.h +++ b/storage/innobase/include/fsp0types.h @@ -371,11 +371,12 @@ these are only used in MySQL 5.7 and used for compatibility. */ /** Validate the tablespace flags, which are stored in the tablespace header at offset FSP_SPACE_FLAGS. @param[in] flags the contents of FSP_SPACE_FLAGS +@param[in] is_ibd whether this is an .ibd file (not system tablespace) @return whether the flags are correct (not in the buggy 10.1) format */ MY_ATTRIBUTE((warn_unused_result, const)) UNIV_INLINE bool -fsp_flags_is_valid(ulint flags) +fsp_flags_is_valid(ulint flags, bool is_ibd) { DBUG_EXECUTE_IF("fsp_flags_is_valid_failure", return(false);); @@ -422,7 +423,12 @@ fsp_flags_is_valid(ulint flags) return(false); } - return(true); + /* The flags do look valid. But, avoid misinterpreting + buggy MariaDB 10.1 format flags for + PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL={0,2,3} + as valid-looking PAGE_SSIZE if this is known to be + an .ibd file and we are using the default innodb_page_size=16k. */ + return(ssize == 0 || !is_ibd || srv_page_size != UNIV_PAGE_SIZE_ORIG); } #endif /* fsp0types_h */ diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index b2ac33a209b..45ca1582e49 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -527,7 +527,7 @@ AbstractCallback::init( const page_t* page = block->frame; m_space_flags = fsp_header_get_flags(page); - if (!fsp_flags_is_valid(m_space_flags)) { + if (!fsp_flags_is_valid(m_space_flags, true)) { ulint cflags = fsp_flags_convert_from_101(m_space_flags); if (cflags == ULINT_UNDEFINED) { ib::error() << "Invalid FSP_SPACE_FLAGS=" From e555540ab6b9c3e0d4fdd00af093b115a9401d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 5 Jul 2017 14:35:55 +0300 Subject: [PATCH 057/102] MDEV-13105 InnoDB fails to load a table with PAGE_COMPRESSION_LEVEL after upgrade from 10.1.20 When using innodb_page_size=16k, InnoDB tables that were created in MariaDB 10.1.0 to 10.1.20 with PAGE_COMPRESSED=1 and PAGE_COMPRESSION_LEVEL=2 or PAGE_COMPRESSION_LEVEL=3 would fail to load. fsp_flags_is_valid(): When using innodb_page_size=16k, use a more strict check for .ibd files, with the assumption that nobody would try to use different-page-size files. --- mysql-test/suite/innodb/include/ibd_convert.pl | 2 +- .../suite/innodb/r/101_compatibility.result | 2 +- mysql-test/suite/innodb/t/101_compatibility.test | 2 +- storage/innobase/buf/buf0dblwr.cc | 2 +- storage/innobase/fil/fil0fil.cc | 14 +++++++------- storage/innobase/fsp/fsp0fsp.cc | 2 +- storage/innobase/include/dict0dict.ic | 2 +- storage/innobase/include/fsp0fsp.h | 16 +++++++++++----- storage/innobase/row/row0import.cc | 2 +- storage/xtradb/buf/buf0dblwr.cc | 2 +- storage/xtradb/fil/fil0fil.cc | 14 +++++++------- storage/xtradb/fsp/fsp0fsp.cc | 2 +- storage/xtradb/include/dict0dict.ic | 2 +- storage/xtradb/include/fsp0fsp.h | 16 +++++++++++----- storage/xtradb/row/row0import.cc | 2 +- 15 files changed, 47 insertions(+), 35 deletions(-) diff --git a/mysql-test/suite/innodb/include/ibd_convert.pl b/mysql-test/suite/innodb/include/ibd_convert.pl index 9c7e829f455..bb9dfbe74b8 100644 --- a/mysql-test/suite/innodb/include/ibd_convert.pl +++ b/mysql-test/suite/innodb/include/ibd_convert.pl @@ -11,7 +11,7 @@ sub convert_to_mariadb_101 # FIL_PAGE_DATA + FSP_SPACE_FLAGS = 38 + 16 = 54 bytes from the start my($flags) = unpack "x[54]N", $_; my $badflags = ($flags & 0x3f); - my $compression_level=6; + my $compression_level=3; $badflags |= 1<<6|$compression_level<<7 if ($flags & 1 << 16); $badflags |= ($flags & 15 << 6) << 7; # PAGE_SSIZE diff --git a/mysql-test/suite/innodb/r/101_compatibility.result b/mysql-test/suite/innodb/r/101_compatibility.result index bf613c1b3b1..7ec8bb19c10 100644 --- a/mysql-test/suite/innodb/r/101_compatibility.result +++ b/mysql-test/suite/innodb/r/101_compatibility.result @@ -7,7 +7,7 @@ CREATE TABLE tc(a INT)ENGINE=InnoDB ROW_FORMAT=COMPACT; CREATE TABLE td(a INT)ENGINE=InnoDB ROW_FORMAT=DYNAMIC; CREATE TABLE tz(a INT)ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1; CREATE TABLE tdd(a INT) ENGINE=InnoDB, DATA DIRECTORY='MYSQL_TMP_DIR'; -CREATE TABLE tp(a INT) ENGINE=InnoDB page_compressed=1; +CREATE TABLE tp(a INT) ENGINE=InnoDB ROW_FORMAT=DYNAMIC PAGE_COMPRESSED=1; CREATE TABLE ti(a INT) ENGINE=InnoDB; FLUSH TABLES ti FOR EXPORT; backup: ti diff --git a/mysql-test/suite/innodb/t/101_compatibility.test b/mysql-test/suite/innodb/t/101_compatibility.test index 25567b939c7..df3261cebd1 100644 --- a/mysql-test/suite/innodb/t/101_compatibility.test +++ b/mysql-test/suite/innodb/t/101_compatibility.test @@ -28,7 +28,7 @@ CREATE TABLE tz(a INT)ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1; --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR EVAL CREATE TABLE tdd(a INT) ENGINE=InnoDB, DATA DIRECTORY='$MYSQL_TMP_DIR'; -CREATE TABLE tp(a INT) ENGINE=InnoDB page_compressed=1; +CREATE TABLE tp(a INT) ENGINE=InnoDB ROW_FORMAT=DYNAMIC PAGE_COMPRESSED=1; CREATE TABLE ti(a INT) ENGINE=InnoDB; FLUSH TABLES ti FOR EXPORT; perl; diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc index 8ff5428d3a5..f35a34e5e98 100644 --- a/storage/innobase/buf/buf0dblwr.cc +++ b/storage/innobase/buf/buf0dblwr.cc @@ -616,7 +616,7 @@ buf_dblwr_process() if (page_no == 0) { /* Check the FSP_SPACE_FLAGS. */ ulint flags = fsp_header_get_flags(page); - if (!fsp_flags_is_valid(flags) + if (!fsp_flags_is_valid(flags, space_id) && fsp_flags_convert_from_101(flags) == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_WARN, diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index d78a8b20f33..6abc7f0e1c2 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -662,7 +662,7 @@ fil_node_open_file( ut_free(buf2); os_file_close(node->handle); - if (!fsp_flags_is_valid(flags)) { + if (!fsp_flags_is_valid(flags, space->id)) { ulint cflags = fsp_flags_convert_from_101(flags); if (cflags == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_ERROR, @@ -2366,7 +2366,7 @@ fil_read_first_page( FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION); } - if (!fsp_flags_is_valid(*flags)) { + if (!fsp_flags_is_valid(*flags, *space_id)) { ulint cflags = fsp_flags_convert_from_101(*flags); if (cflags == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_ERROR, @@ -2497,7 +2497,7 @@ fil_op_write_log( ulint len; log_ptr = mlog_open(mtr, 11 + 2 + 1); - ut_ad(fsp_flags_is_valid(flags)); + ut_ad(fsp_flags_is_valid(flags, space_id)); if (!log_ptr) { /* Logging in mtr is switched off during crash recovery: @@ -3718,7 +3718,7 @@ fil_create_new_single_table_tablespace( ut_ad(!srv_read_only_mode); ut_a(space_id < SRV_LOG_SPACE_FIRST_ID); ut_a(size >= FIL_IBD_FILE_INITIAL_SIZE); - ut_a(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK)); + ut_a(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK, space_id)); if (is_temp) { /* Temporary table filepath */ @@ -3979,7 +3979,7 @@ void fsp_flags_try_adjust(ulint space_id, ulint flags) { ut_ad(!srv_read_only_mode); - ut_ad(fsp_flags_is_valid(flags)); + ut_ad(fsp_flags_is_valid(flags, space_id)); mtr_t mtr; mtr_start(&mtr); @@ -4061,7 +4061,7 @@ fil_open_single_table_tablespace( return(DB_CORRUPTION); } - ut_ad(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK)); + ut_ad(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK, id)); atomic_writes = fsp_flags_get_atomic_writes(flags); memset(&def, 0, sizeof(def)); @@ -4601,7 +4601,7 @@ fil_user_tablespace_restore_page( flags = mach_read_from_4(FSP_HEADER_OFFSET + FSP_SPACE_FLAGS + page); - if (!fsp_flags_is_valid(flags)) { + if (!fsp_flags_is_valid(flags, fsp->id)) { ulint cflags = fsp_flags_convert_from_101(flags); if (cflags == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_WARN, diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc index 9d5e2e984fc..ab96befb700 100644 --- a/storage/innobase/fsp/fsp0fsp.cc +++ b/storage/innobase/fsp/fsp0fsp.cc @@ -661,7 +661,7 @@ fsp_header_init_fields( ulint flags) /*!< in: tablespace flags (FSP_SPACE_FLAGS) */ { flags &= ~FSP_FLAGS_MEM_MASK; - ut_a(fsp_flags_is_valid(flags)); + ut_a(fsp_flags_is_valid(flags, space_id)); mach_write_to_4(FSP_HEADER_OFFSET + FSP_SPACE_ID + page, space_id); diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic index 6044f992d82..147968a343a 100644 --- a/storage/innobase/include/dict0dict.ic +++ b/storage/innobase/include/dict0dict.ic @@ -934,7 +934,7 @@ dict_tf_to_fsp_flags( fsp_flags |= FSP_FLAGS_MASK_PAGE_COMPRESSION; } - ut_a(fsp_flags_is_valid(fsp_flags)); + ut_a(fsp_flags_is_valid(fsp_flags, false)); if (DICT_TF_HAS_DATA_DIR(table_flags)) { fsp_flags |= 1U << FSP_FLAGS_MEM_DATA_DIR; diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h index d8d044ba2ec..275a5785ce2 100644 --- a/storage/innobase/include/fsp0fsp.h +++ b/storage/innobase/include/fsp0fsp.h @@ -788,11 +788,12 @@ fseg_print( /** Validate the tablespace flags, which are stored in the tablespace header at offset FSP_SPACE_FLAGS. @param[in] flags the contents of FSP_SPACE_FLAGS +@param[in] is_ibd whether this is an .ibd file (not system tablespace) @return whether the flags are correct (not in the buggy 10.1) format */ MY_ATTRIBUTE((warn_unused_result, const)) UNIV_INLINE bool -fsp_flags_is_valid(ulint flags) +fsp_flags_is_valid(ulint flags, bool is_ibd) { DBUG_EXECUTE_IF("fsp_flags_is_valid_failure", return(false);); @@ -816,7 +817,7 @@ fsp_flags_is_valid(ulint flags) bits 10..14 would be nonzero 0bsssaa where sss is nonzero PAGE_SSIZE (3, 4, 6, or 7) and aa is ATOMIC_WRITES (not 0b11). */ - if (FSP_FLAGS_GET_RESERVED(flags) & ~1) { + if (FSP_FLAGS_GET_RESERVED(flags) & ~1U) { return(false); } @@ -839,7 +840,12 @@ fsp_flags_is_valid(ulint flags) return(false); } - return(true); + /* The flags do look valid. But, avoid misinterpreting + buggy MariaDB 10.1 format flags for + PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL={0,2,3} + as valid-looking PAGE_SSIZE if this is known to be + an .ibd file and we are using the default innodb_page_size=16k. */ + return(ssize == 0 || !is_ibd || srv_page_size != UNIV_PAGE_SIZE_ORIG); } /** Convert FSP_SPACE_FLAGS from the buggy MariaDB 10.1.0..10.1.20 format. @@ -948,7 +954,7 @@ fsp_flags_convert_from_101(ulint flags) flags = ((flags & 0x3f) | ssize << FSP_FLAGS_POS_PAGE_SSIZE | FSP_FLAGS_GET_PAGE_COMPRESSION_MARIADB101(flags) << FSP_FLAGS_POS_PAGE_COMPRESSION); - ut_ad(fsp_flags_is_valid(flags)); + ut_ad(fsp_flags_is_valid(flags, false)); return(flags); } @@ -962,7 +968,7 @@ bool fsp_flags_match(ulint expected, ulint actual) { expected &= ~FSP_FLAGS_MEM_MASK; - ut_ad(fsp_flags_is_valid(expected)); + ut_ad(fsp_flags_is_valid(expected, false)); if (actual == expected) { return(true); diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index 43830725978..4375d491ba7 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -548,7 +548,7 @@ AbstractCallback::init( const page_t* page = block->frame; m_space_flags = fsp_header_get_flags(page); - if (!fsp_flags_is_valid(m_space_flags)) { + if (!fsp_flags_is_valid(m_space_flags, true)) { ulint cflags = fsp_flags_convert_from_101(m_space_flags); if (cflags == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_ERROR, diff --git a/storage/xtradb/buf/buf0dblwr.cc b/storage/xtradb/buf/buf0dblwr.cc index 49371f9a6f1..d6e738f15fa 100644 --- a/storage/xtradb/buf/buf0dblwr.cc +++ b/storage/xtradb/buf/buf0dblwr.cc @@ -616,7 +616,7 @@ buf_dblwr_process() if (page_no == 0) { /* Check the FSP_SPACE_FLAGS. */ ulint flags = fsp_header_get_flags(page); - if (!fsp_flags_is_valid(flags) + if (!fsp_flags_is_valid(flags, space_id) && fsp_flags_convert_from_101(flags) == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_WARN, diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc index fdd09a6034e..dbf6501b183 100644 --- a/storage/xtradb/fil/fil0fil.cc +++ b/storage/xtradb/fil/fil0fil.cc @@ -670,7 +670,7 @@ fil_node_open_file( ut_free(buf2); os_file_close(node->handle); - if (!fsp_flags_is_valid(flags)) { + if (!fsp_flags_is_valid(flags, space->id)) { ulint cflags = fsp_flags_convert_from_101(flags); if (cflags == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_ERROR, @@ -2426,7 +2426,7 @@ fil_read_first_page( FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION); } - if (!fsp_flags_is_valid(*flags)) { + if (!fsp_flags_is_valid(*flags, *space_id)) { ulint cflags = fsp_flags_convert_from_101(*flags); if (cflags == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_ERROR, @@ -2541,7 +2541,7 @@ fil_op_write_log( ulint len; log_ptr = mlog_open(mtr, 11 + 2 + 1); - ut_ad(fsp_flags_is_valid(flags)); + ut_ad(fsp_flags_is_valid(flags, space_id)); if (!log_ptr) { /* Logging in mtr is switched off during crash recovery: @@ -3778,7 +3778,7 @@ fil_create_new_single_table_tablespace( ut_ad(!srv_read_only_mode); ut_a(space_id < SRV_LOG_SPACE_FIRST_ID); ut_a(size >= FIL_IBD_FILE_INITIAL_SIZE); - ut_a(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK)); + ut_a(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK, space_id)); if (is_temp) { /* Temporary table filepath */ @@ -4172,7 +4172,7 @@ void fsp_flags_try_adjust(ulint space_id, ulint flags) { ut_ad(!srv_read_only_mode); - ut_ad(fsp_flags_is_valid(flags)); + ut_ad(fsp_flags_is_valid(flags, space_id)); mtr_t mtr; mtr_start(&mtr); @@ -4254,7 +4254,7 @@ fil_open_single_table_tablespace( return(DB_CORRUPTION); } - ut_ad(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK)); + ut_ad(fsp_flags_is_valid(flags & ~FSP_FLAGS_MEM_MASK, id)); atomic_writes = fsp_flags_get_atomic_writes(flags); memset(&def, 0, sizeof(def)); @@ -4795,7 +4795,7 @@ fil_user_tablespace_restore_page( flags = mach_read_from_4(FSP_HEADER_OFFSET + FSP_SPACE_FLAGS + page); - if (!fsp_flags_is_valid(flags)) { + if (!fsp_flags_is_valid(flags, fsp->id)) { ulint cflags = fsp_flags_convert_from_101(flags); if (cflags == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_WARN, diff --git a/storage/xtradb/fsp/fsp0fsp.cc b/storage/xtradb/fsp/fsp0fsp.cc index df8c6ffe222..b5491ac6550 100644 --- a/storage/xtradb/fsp/fsp0fsp.cc +++ b/storage/xtradb/fsp/fsp0fsp.cc @@ -664,7 +664,7 @@ fsp_header_init_fields( ulint flags) /*!< in: tablespace flags (FSP_SPACE_FLAGS) */ { flags &= ~FSP_FLAGS_MEM_MASK; - ut_a(fsp_flags_is_valid(flags)); + ut_a(fsp_flags_is_valid(flags, space_id)); mach_write_to_4(FSP_HEADER_OFFSET + FSP_SPACE_ID + page, space_id); diff --git a/storage/xtradb/include/dict0dict.ic b/storage/xtradb/include/dict0dict.ic index f68d4e176da..4db6a73bbc2 100644 --- a/storage/xtradb/include/dict0dict.ic +++ b/storage/xtradb/include/dict0dict.ic @@ -934,7 +934,7 @@ dict_tf_to_fsp_flags( fsp_flags |= FSP_FLAGS_MASK_PAGE_COMPRESSION; } - ut_a(fsp_flags_is_valid(fsp_flags)); + ut_a(fsp_flags_is_valid(fsp_flags, false)); if (DICT_TF_HAS_DATA_DIR(table_flags)) { fsp_flags |= 1U << FSP_FLAGS_MEM_DATA_DIR; diff --git a/storage/xtradb/include/fsp0fsp.h b/storage/xtradb/include/fsp0fsp.h index 715572199ab..7395a248bed 100644 --- a/storage/xtradb/include/fsp0fsp.h +++ b/storage/xtradb/include/fsp0fsp.h @@ -787,11 +787,12 @@ fseg_print( /** Validate the tablespace flags, which are stored in the tablespace header at offset FSP_SPACE_FLAGS. @param[in] flags the contents of FSP_SPACE_FLAGS +@param[in] is_ibd whether this is an .ibd file (not system tablespace) @return whether the flags are correct (not in the buggy 10.1) format */ MY_ATTRIBUTE((warn_unused_result, const)) UNIV_INLINE bool -fsp_flags_is_valid(ulint flags) +fsp_flags_is_valid(ulint flags, bool is_ibd) { DBUG_EXECUTE_IF("fsp_flags_is_valid_failure", return(false);); @@ -815,7 +816,7 @@ fsp_flags_is_valid(ulint flags) bits 10..14 would be nonzero 0bsssaa where sss is nonzero PAGE_SSIZE (3, 4, 6, or 7) and aa is ATOMIC_WRITES (not 0b11). */ - if (FSP_FLAGS_GET_RESERVED(flags) & ~1) { + if (FSP_FLAGS_GET_RESERVED(flags) & ~1U) { return(false); } @@ -838,7 +839,12 @@ fsp_flags_is_valid(ulint flags) return(false); } - return(true); + /* The flags do look valid. But, avoid misinterpreting + buggy MariaDB 10.1 format flags for + PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL={0,2,3} + as valid-looking PAGE_SSIZE if this is known to be + an .ibd file and we are using the default innodb_page_size=16k. */ + return(ssize == 0 || !is_ibd || srv_page_size != UNIV_PAGE_SIZE_ORIG); } /** Convert FSP_SPACE_FLAGS from the buggy MariaDB 10.1.0..10.1.20 format. @@ -947,7 +953,7 @@ fsp_flags_convert_from_101(ulint flags) flags = ((flags & 0x3f) | ssize << FSP_FLAGS_POS_PAGE_SSIZE | FSP_FLAGS_GET_PAGE_COMPRESSION_MARIADB101(flags) << FSP_FLAGS_POS_PAGE_COMPRESSION); - ut_ad(fsp_flags_is_valid(flags)); + ut_ad(fsp_flags_is_valid(flags, false)); return(flags); } @@ -961,7 +967,7 @@ bool fsp_flags_match(ulint expected, ulint actual) { expected &= ~FSP_FLAGS_MEM_MASK; - ut_ad(fsp_flags_is_valid(expected)); + ut_ad(fsp_flags_is_valid(expected, false)); if (actual == expected) { return(true); diff --git a/storage/xtradb/row/row0import.cc b/storage/xtradb/row/row0import.cc index 86b2d782b7b..a99c72c01b5 100644 --- a/storage/xtradb/row/row0import.cc +++ b/storage/xtradb/row/row0import.cc @@ -549,7 +549,7 @@ AbstractCallback::init( const page_t* page = block->frame; m_space_flags = fsp_header_get_flags(page); - if (!fsp_flags_is_valid(m_space_flags)) { + if (!fsp_flags_is_valid(m_space_flags, true)) { ulint cflags = fsp_flags_convert_from_101(m_space_flags); if (cflags == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_ERROR, From 4f93c732d5c286b655a1d6b434e7190800d89c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Wed, 28 Jun 2017 19:39:49 +0300 Subject: [PATCH 058/102] MDEV-13189: Window functions crash when using INTERVAL Interval function makes use of Item_row. Item_row did not correctly mark with_window_func flag according to its arguments. Fix it by making Item_row aware of this flag. --- mysql-test/r/win.result | 14 ++++++++++++++ mysql-test/t/win.test | 9 +++++++++ sql/item_row.cc | 1 + 3 files changed, 24 insertions(+) diff --git a/mysql-test/r/win.result b/mysql-test/r/win.result index 952bd82ac7f..7f8777ed491 100644 --- a/mysql-test/r/win.result +++ b/mysql-test/r/win.result @@ -3127,3 +3127,17 @@ NULL 1 0 1 0 1 2 0 1 drop table t1; +# +# MDEV-13189: Window functions crash when using INTERVAL function +# +create table t1(i int); +insert into t1 values (1),(2),(10),(20),(30); +select sum(i) over (order by i), interval(sum(i) over (order by i), 10, 20) +from t1; +sum(i) over (order by i) interval(sum(i) over (order by i), 10, 20) +1 0 +3 0 +13 1 +33 2 +63 2 +drop table t1; diff --git a/mysql-test/t/win.test b/mysql-test/t/win.test index 45653b18682..aff717e3151 100644 --- a/mysql-test/t/win.test +++ b/mysql-test/t/win.test @@ -1914,3 +1914,12 @@ select max(i) over (order by i), max(i) over (order by i) is not null from t1; drop table t1; + +--echo # +--echo # MDEV-13189: Window functions crash when using INTERVAL function +--echo # +create table t1(i int); +insert into t1 values (1),(2),(10),(20),(30); +select sum(i) over (order by i), interval(sum(i) over (order by i), 10, 20) +from t1; +drop table t1; diff --git a/sql/item_row.cc b/sql/item_row.cc index ddbb0736d54..fc484f560ee 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -63,6 +63,7 @@ bool Item_row::fix_fields(THD *thd, Item **ref) } maybe_null|= item->maybe_null; with_sum_func= with_sum_func || item->with_sum_func; + with_window_func = with_window_func || item->with_window_func; with_field= with_field || item->with_field; with_subselect|= item->with_subselect; } From 10a98a4992fd6f69959b8a490cfb19f91f85df4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 5 Jul 2017 17:22:53 +0300 Subject: [PATCH 059/102] Adjust a test for Windows On Windows, when tmpdir is not writable, there are only messages like this: 2017-07-05 14:04:25 3860 [ERROR] InnoDB: Unable to create temporary file; errno: 0 On other platforms, there would be two messages for each failure: 2017-07-05 17:23:02 140436573771648 [ERROR] mysqld: Can't create/write to file '/dev/null/nonexistent/ibaajU4U' (Errcode: 20 "Not a directory") 2017-07-05 17:23:02 140436573771648 [ERROR] InnoDB: Unable to create temporary file; errno: 20 --- mysql-test/suite/innodb/r/temporary_table.result | 1 - mysql-test/suite/innodb/t/temporary_table.test | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mysql-test/suite/innodb/r/temporary_table.result b/mysql-test/suite/innodb/r/temporary_table.result index 689d5a530d2..a6f2d28fc4a 100644 --- a/mysql-test/suite/innodb/r/temporary_table.result +++ b/mysql-test/suite/innodb/r/temporary_table.result @@ -137,7 +137,6 @@ Tables_in_test create temporary table t1 (keyc int, c1 char(100), c2 char(100)) engine = innodb; ERROR HY000: Can't create table `test`.`t1` (errno: 165 "Table is read only") # test various bad start-up parameters -FOUND 3 /Can't create/write to file '.dev.null.nonexistent.ib/ in mysqld.1.err FOUND 3 /InnoDB: Unable to create temporary file/ in mysqld.1.err FOUND 1 /innodb_temporary and innodb_system file names seem to be the same/ in mysqld.1.err SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' diff --git a/mysql-test/suite/innodb/t/temporary_table.test b/mysql-test/suite/innodb/t/temporary_table.test index 45f84834edb..4184daaf064 100644 --- a/mysql-test/suite/innodb/t/temporary_table.test +++ b/mysql-test/suite/innodb/t/temporary_table.test @@ -10,7 +10,7 @@ --source include/no_valgrind_without_big.inc --disable_query_log -call mtr.add_suppression("Can't create/write to file '.dev.null.nonexistent.ib"); +call mtr.add_suppression("Can't create/write to file '/dev/null/nonexistent/ib"); call mtr.add_suppression("InnoDB: Unable to create temporary file"); call mtr.add_suppression("last file in setting innodb_temp_data_file_path"); call mtr.add_suppression("The table 't1' is full"); @@ -151,8 +151,6 @@ while ($mysql_errno) --enable_query_log --enable_result_log --disable_reconnect ---let SEARCH_PATTERN= Can't create/write to file '.dev.null.nonexistent.ib ---source include/search_pattern_in_file.inc --let SEARCH_PATTERN= InnoDB: Unable to create temporary file --source include/search_pattern_in_file.inc From e022c22ba8641b6f439fb4928e85fafffea75abb Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 4 Jul 2017 10:29:49 +0200 Subject: [PATCH 060/102] update sysvar_server_embedded.result on 32bit --- .../r/sysvars_server_embedded,32bit.rdiff | 287 ++++++++++-------- 1 file changed, 158 insertions(+), 129 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff index 0f34179a16d..1e3c91cb584 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff @@ -226,7 +226,7 @@ NUMERIC_MAX_VALUE 1000 @@ -1012,7 +1012,7 @@ VARIABLE_TYPE BIGINT UNSIGNED - VARIABLE_COMMENT The maximum length of the result of function GROUP_CONCAT() + VARIABLE_COMMENT The maximum length of the result of function GROUP_CONCAT() NUMERIC_MIN_VALUE 4 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 @@ -289,14 +289,14 @@ READ_ONLY NO @@ -1597,7 +1597,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 31536000 + DEFAULT_VALUE 86400 VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -1709,7 +1709,7 @@ +@@ -1737,7 +1737,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -305,25 +305,25 @@ VARIABLE_COMMENT Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1751,7 +1751,7 @@ +@@ -1779,7 +1779,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 1 + DEFAULT_VALUE 2 VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1793,7 +1793,7 @@ +@@ -1821,7 +1821,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 4194304 + DEFAULT_VALUE 16777216 VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Max packet length to send to or receive from the server NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -1803,14 +1803,14 @@ +@@ -1831,14 +1831,14 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_BINLOG_CACHE_SIZE SESSION_VALUE NULL @@ -341,7 +341,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1821,7 +1821,7 @@ +@@ -1849,7 +1849,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1073741824 VARIABLE_SCOPE GLOBAL @@ -350,7 +350,7 @@ VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 1073741824 -@@ -1831,14 +1831,14 @@ +@@ -1859,14 +1859,14 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_BINLOG_STMT_CACHE_SIZE SESSION_VALUE NULL @@ -368,7 +368,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1849,7 +1849,7 @@ +@@ -1877,7 +1877,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 151 VARIABLE_SCOPE GLOBAL @@ -377,7 +377,7 @@ VARIABLE_COMMENT The number of simultaneous clients allowed NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -1863,7 +1863,7 @@ +@@ -1891,7 +1891,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -386,7 +386,7 @@ VARIABLE_COMMENT If there is more than this number of interrupted connections from a host this host will be blocked from further connections NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1877,7 +1877,7 @@ +@@ -1905,7 +1905,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 20 VARIABLE_SCOPE SESSION @@ -395,7 +395,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1905,7 +1905,7 @@ +@@ -1933,7 +1933,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 64 VARIABLE_SCOPE SESSION @@ -404,7 +404,7 @@ VARIABLE_COMMENT Max number of errors/warnings to store for a statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -1922,7 +1922,7 @@ +@@ -1950,7 +1950,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't allow creation of heap tables bigger than this NUMERIC_MIN_VALUE 16384 @@ -413,7 +413,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1933,7 +1933,7 @@ +@@ -1961,7 +1961,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 20 VARIABLE_SCOPE SESSION @@ -422,7 +422,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1961,7 +1961,7 @@ +@@ -1989,7 +1989,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE SESSION @@ -431,7 +431,7 @@ VARIABLE_COMMENT Max number of bytes in sorted records NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -1975,7 +1975,7 @@ +@@ -2003,7 +2003,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 1048576 VARIABLE_SCOPE GLOBAL @@ -440,7 +440,7 @@ VARIABLE_COMMENT The maximum BLOB length to send to server from mysql_send_long_data API. Deprecated option; use max_allowed_packet instead. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -1989,7 +1989,7 @@ +@@ -2017,7 +2017,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16382 VARIABLE_SCOPE GLOBAL @@ -449,7 +449,7 @@ VARIABLE_COMMENT Maximum number of prepared statements in the server NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2003,7 +2003,7 @@ +@@ -2031,7 +2031,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4294967295 VARIABLE_SCOPE SESSION @@ -458,7 +458,7 @@ VARIABLE_COMMENT Maximum number of iterations when executing recursive queries NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2017,7 +2017,7 @@ +@@ -2045,7 +2045,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4294967295 VARIABLE_SCOPE SESSION @@ -467,7 +467,7 @@ VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2031,7 +2031,7 @@ +@@ -2073,7 +2073,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE SESSION @@ -476,7 +476,7 @@ VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -2045,7 +2045,7 @@ +@@ -2087,7 +2087,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION @@ -485,7 +485,7 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -2073,7 +2073,7 @@ +@@ -2115,7 +2115,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 32 VARIABLE_SCOPE SESSION @@ -494,7 +494,7 @@ VARIABLE_COMMENT Unused, will be removed. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2101,7 +2101,7 @@ +@@ -2143,7 +2143,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4294967295 VARIABLE_SCOPE GLOBAL @@ -503,7 +503,7 @@ VARIABLE_COMMENT After this many write locks, allow some read locks to run in between NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2115,7 +2115,7 @@ +@@ -2157,7 +2157,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE GLOBAL @@ -512,7 +512,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -2129,7 +2129,7 @@ +@@ -2171,7 +2171,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8 VARIABLE_SCOPE GLOBAL @@ -521,7 +521,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2143,7 +2143,7 @@ +@@ -2185,7 +2185,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION @@ -530,7 +530,7 @@ VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2157,7 +2157,7 @@ +@@ -2199,7 +2199,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 262144 VARIABLE_SCOPE SESSION @@ -539,7 +539,7 @@ VARIABLE_COMMENT Size of buffer to use when using MRR with range access NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2171,10 +2171,10 @@ +@@ -2213,10 +2213,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 256 VARIABLE_SCOPE SESSION @@ -552,7 +552,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2185,7 +2185,7 @@ +@@ -2227,7 +2227,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE GLOBAL @@ -561,7 +561,7 @@ VARIABLE_COMMENT Block size to be used for MyISAM index pages NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 16384 -@@ -2199,7 +2199,7 @@ +@@ -2241,7 +2241,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 6 VARIABLE_SCOPE GLOBAL @@ -570,7 +570,7 @@ VARIABLE_COMMENT Default pointer size to be used for MyISAM tables NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 7 -@@ -2209,9 +2209,9 @@ +@@ -2251,9 +2251,9 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_MAX_SORT_FILE_SIZE SESSION_VALUE NULL @@ -582,7 +582,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't use the fast sort index method to created index if the temporary file would get bigger than this -@@ -2223,14 +2223,14 @@ +@@ -2265,14 +2265,14 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_MMAP_SIZE SESSION_VALUE NULL @@ -600,7 +600,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2255,10 +2255,10 @@ +@@ -2297,10 +2297,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -613,7 +613,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2272,7 +2272,7 @@ +@@ -2314,7 +2314,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE NUMERIC_MIN_VALUE 4096 @@ -622,7 +622,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2325,7 +2325,7 @@ +@@ -2367,7 +2367,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16384 VARIABLE_SCOPE SESSION @@ -631,7 +631,7 @@ VARIABLE_COMMENT Buffer length for TCP/IP and socket communication NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1048576 -@@ -2339,7 +2339,7 @@ +@@ -2381,7 +2381,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 30 VARIABLE_SCOPE SESSION @@ -640,7 +640,7 @@ VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2353,7 +2353,7 @@ +@@ -2395,7 +2395,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10 VARIABLE_SCOPE SESSION @@ -649,7 +649,7 @@ VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2367,7 +2367,7 @@ +@@ -2409,7 +2409,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 60 VARIABLE_SCOPE SESSION @@ -658,7 +658,7 @@ VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2437,7 +2437,7 @@ +@@ -2479,7 +2479,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -667,7 +667,7 @@ VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1 -@@ -2451,7 +2451,7 @@ +@@ -2493,7 +2493,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 62 VARIABLE_SCOPE SESSION @@ -676,7 +676,7 @@ VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2465,7 +2465,7 @@ +@@ -2507,7 +2507,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE SESSION @@ -685,7 +685,7 @@ VARIABLE_COMMENT Controls number of record samples to check condition selectivity NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 4294967295 -@@ -2493,7 +2493,7 @@ +@@ -2535,7 +2535,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -694,7 +694,7 @@ VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 -@@ -2521,7 +2521,7 @@ +@@ -2563,7 +2563,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -703,7 +703,7 @@ VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2535,7 +2535,7 @@ +@@ -2577,7 +2577,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -712,7 +712,7 @@ VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 200 -@@ -2549,7 +2549,7 @@ +@@ -2591,7 +2591,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -721,7 +721,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2563,7 +2563,7 @@ +@@ -2605,7 +2605,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -730,7 +730,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2577,7 +2577,7 @@ +@@ -2619,7 +2619,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -739,7 +739,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2591,7 +2591,7 @@ +@@ -2633,7 +2633,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -748,7 +748,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2605,7 +2605,7 @@ +@@ -2647,7 +2647,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -757,7 +757,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2619,7 +2619,7 @@ +@@ -2661,7 +2661,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -766,7 +766,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2633,7 +2633,7 @@ +@@ -2675,7 +2675,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -775,7 +775,7 @@ VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2647,7 +2647,7 @@ +@@ -2689,7 +2689,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 80 VARIABLE_SCOPE GLOBAL @@ -784,7 +784,7 @@ VARIABLE_COMMENT Maximum number of condition instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2661,7 +2661,7 @@ +@@ -2703,7 +2703,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -793,7 +793,7 @@ VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2675,7 +2675,7 @@ +@@ -2717,7 +2717,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE GLOBAL @@ -802,7 +802,7 @@ VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2689,7 +2689,7 @@ +@@ -2731,7 +2731,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 50 VARIABLE_SCOPE GLOBAL @@ -811,7 +811,7 @@ VARIABLE_COMMENT Maximum number of file instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2703,7 +2703,7 @@ +@@ -2745,7 +2745,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 32768 VARIABLE_SCOPE GLOBAL @@ -820,7 +820,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented files. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2717,7 +2717,7 @@ +@@ -2759,7 +2759,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -829,7 +829,7 @@ VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2731,7 +2731,7 @@ +@@ -2773,7 +2773,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 200 VARIABLE_SCOPE GLOBAL @@ -838,7 +838,7 @@ VARIABLE_COMMENT Maximum number of mutex instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2745,7 +2745,7 @@ +@@ -2787,7 +2787,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -847,7 +847,7 @@ VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2759,7 +2759,7 @@ +@@ -2801,7 +2801,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 40 VARIABLE_SCOPE GLOBAL @@ -856,7 +856,7 @@ VARIABLE_COMMENT Maximum number of rwlock instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2773,7 +2773,7 @@ +@@ -2815,7 +2815,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -865,7 +865,7 @@ VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2787,7 +2787,7 @@ +@@ -2829,7 +2829,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10 VARIABLE_SCOPE GLOBAL @@ -874,7 +874,7 @@ VARIABLE_COMMENT Maximum number of socket instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2801,7 +2801,7 @@ +@@ -2843,7 +2843,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -883,7 +883,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2815,7 +2815,7 @@ +@@ -2857,7 +2857,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 150 VARIABLE_SCOPE GLOBAL @@ -892,49 +892,22 @@ VARIABLE_COMMENT Maximum number of stage instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2829,7 +2829,7 @@ +@@ -2871,7 +2871,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 185 + DEFAULT_VALUE 188 VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Maximum number of statement instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2843,7 +2843,7 @@ - GLOBAL_VALUE_ORIGIN CONFIG - DEFAULT_VALUE -1 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT -+VARIABLE_TYPE INT - VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. - NUMERIC_MIN_VALUE -1 - NUMERIC_MAX_VALUE 1048576 -@@ -2857,7 +2857,7 @@ - GLOBAL_VALUE_ORIGIN CONFIG - DEFAULT_VALUE -1 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT -+VARIABLE_TYPE INT - VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. - NUMERIC_MIN_VALUE -1 - NUMERIC_MAX_VALUE 1048576 -@@ -2871,7 +2871,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 50 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Maximum number of thread instruments. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 256 @@ -2885,7 +2885,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT +VARIABLE_TYPE INT - VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. + VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 @@ -2899,7 +2899,7 @@ @@ -943,10 +916,37 @@ VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT +VARIABLE_TYPE INT - VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. + VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 @@ -2913,7 +2913,7 @@ + GLOBAL_VALUE_ORIGIN COMPILE-TIME + DEFAULT_VALUE 50 + VARIABLE_SCOPE GLOBAL +-VARIABLE_TYPE BIGINT UNSIGNED ++VARIABLE_TYPE INT UNSIGNED + VARIABLE_COMMENT Maximum number of thread instruments. + NUMERIC_MIN_VALUE 0 + NUMERIC_MAX_VALUE 256 +@@ -2927,7 +2927,7 @@ + GLOBAL_VALUE_ORIGIN CONFIG + DEFAULT_VALUE -1 + VARIABLE_SCOPE GLOBAL +-VARIABLE_TYPE BIGINT ++VARIABLE_TYPE INT + VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. + NUMERIC_MIN_VALUE -1 + NUMERIC_MAX_VALUE 1048576 +@@ -2941,7 +2941,7 @@ + GLOBAL_VALUE_ORIGIN CONFIG + DEFAULT_VALUE -1 + VARIABLE_SCOPE GLOBAL +-VARIABLE_TYPE BIGINT ++VARIABLE_TYPE INT + VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. + NUMERIC_MIN_VALUE -1 + NUMERIC_MAX_VALUE 1048576 +@@ -2955,7 +2955,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -955,7 +955,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1024 -@@ -2927,7 +2927,7 @@ +@@ -2969,7 +2969,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -964,7 +964,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2941,7 +2941,7 @@ +@@ -2983,7 +2983,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -973,7 +973,7 @@ VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3011,7 +3011,7 @@ +@@ -3053,7 +3053,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 32768 VARIABLE_SCOPE SESSION @@ -982,7 +982,7 @@ VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3039,7 +3039,7 @@ +@@ -3081,7 +3081,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 15 VARIABLE_SCOPE SESSION @@ -991,7 +991,7 @@ VARIABLE_COMMENT Limit of query profiling memory NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 100 -@@ -3053,7 +3053,7 @@ +@@ -3095,7 +3095,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 5 VARIABLE_SCOPE SESSION @@ -1000,7 +1000,7 @@ VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3123,7 +3123,7 @@ +@@ -3165,7 +3165,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16384 VARIABLE_SCOPE SESSION @@ -1009,7 +1009,7 @@ VARIABLE_COMMENT Allocation block size for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3137,7 +3137,7 @@ +@@ -3179,7 +3179,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1048576 VARIABLE_SCOPE GLOBAL @@ -1018,7 +1018,7 @@ VARIABLE_COMMENT Don't cache results that are bigger than this NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3151,7 +3151,7 @@ +@@ -3193,7 +3193,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4096 VARIABLE_SCOPE GLOBAL @@ -1027,7 +1027,7 @@ VARIABLE_COMMENT The minimum size for blocks allocated by the query cache NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3168,7 +3168,7 @@ +@@ -3210,7 +3210,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The memory allocated to store results from old queries NUMERIC_MIN_VALUE 0 @@ -1036,7 +1036,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3221,7 +3221,7 @@ +@@ -3263,7 +3263,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 24576 VARIABLE_SCOPE SESSION @@ -1045,7 +1045,7 @@ VARIABLE_COMMENT Persistent buffer for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3235,7 +3235,7 @@ +@@ -3277,7 +3277,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4096 VARIABLE_SCOPE SESSION @@ -1054,7 +1054,7 @@ VARIABLE_COMMENT Allocation block size for storing ranges during optimization NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 4294967295 -@@ -3249,7 +3249,7 @@ +@@ -3291,7 +3291,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 131072 VARIABLE_SCOPE SESSION @@ -1063,7 +1063,7 @@ VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -3277,7 +3277,7 @@ +@@ -3319,7 +3319,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 262144 VARIABLE_SCOPE SESSION @@ -1072,7 +1072,7 @@ VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 2147483647 -@@ -3291,10 +3291,10 @@ +@@ -3333,10 +3333,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8388608 VARIABLE_SCOPE SESSION @@ -1085,7 +1085,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3333,7 +3333,7 @@ +@@ -3375,7 +3375,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -1094,7 +1094,7 @@ VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -3431,7 +3431,7 @@ +@@ -3473,7 +3473,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1073741824 VARIABLE_SCOPE GLOBAL @@ -1103,7 +1103,7 @@ VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3445,7 +3445,7 @@ +@@ -3487,7 +3487,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2 VARIABLE_SCOPE GLOBAL @@ -1112,7 +1112,7 @@ VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -3504,7 +3504,7 @@ +@@ -3546,7 +3546,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size NUMERIC_MIN_VALUE 1024 @@ -1121,7 +1121,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3795,7 +3795,7 @@ +@@ -3837,7 +3837,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 256 VARIABLE_SCOPE GLOBAL @@ -1130,7 +1130,7 @@ VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 524288 -@@ -3865,7 +3865,7 @@ +@@ -3907,7 +3907,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 400 VARIABLE_SCOPE GLOBAL @@ -1139,7 +1139,7 @@ VARIABLE_COMMENT The number of cached table definitions NUMERIC_MIN_VALUE 400 NUMERIC_MAX_VALUE 524288 -@@ -3879,7 +3879,7 @@ +@@ -3921,7 +3921,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2000 VARIABLE_SCOPE GLOBAL @@ -1148,7 +1148,7 @@ VARIABLE_COMMENT The number of cached open tables NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -3893,7 +3893,7 @@ +@@ -3949,7 +3949,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 256 VARIABLE_SCOPE GLOBAL @@ -1157,7 +1157,7 @@ VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -3907,7 +3907,7 @@ +@@ -3963,7 +3963,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10 VARIABLE_SCOPE GLOBAL @@ -1166,16 +1166,45 @@ VARIABLE_COMMENT Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 512 -@@ -4022,7 +4022,7 @@ +@@ -4070,15 +4070,15 @@ + READ_ONLY YES + COMMAND_LINE_ARGUMENT REQUIRED + VARIABLE_NAME TMP_DISK_TABLE_SIZE +-SESSION_VALUE 18446744073709551615 +-GLOBAL_VALUE 18446744073709551615 ++SESSION_VALUE 4294967295 ++GLOBAL_VALUE 4294967295 + GLOBAL_VALUE_ORIGIN COMPILE-TIME +-DEFAULT_VALUE 18446744073709551615 ++DEFAULT_VALUE 4294967295 + VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED - VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table + VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 1024 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4033,7 +4033,7 @@ +@@ -4092,7 +4092,7 @@ + VARIABLE_TYPE BIGINT UNSIGNED + VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. + NUMERIC_MIN_VALUE 1024 +-NUMERIC_MAX_VALUE 18446744073709551615 ++NUMERIC_MAX_VALUE 4294967295 + NUMERIC_BLOCK_SIZE 1 + ENUM_VALUE_LIST NULL + READ_ONLY NO +@@ -4106,7 +4106,7 @@ + VARIABLE_TYPE BIGINT UNSIGNED + VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table. + NUMERIC_MIN_VALUE 1024 +-NUMERIC_MAX_VALUE 18446744073709551615 ++NUMERIC_MAX_VALUE 4294967295 + NUMERIC_BLOCK_SIZE 1 + ENUM_VALUE_LIST NULL + READ_ONLY NO +@@ -4117,7 +4117,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8192 VARIABLE_SCOPE SESSION @@ -1184,7 +1213,7 @@ VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4047,7 +4047,7 @@ +@@ -4131,7 +4131,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4096 VARIABLE_SCOPE SESSION @@ -1193,7 +1222,7 @@ VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4145,7 +4145,7 @@ +@@ -4229,7 +4229,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 28800 VARIABLE_SCOPE SESSION @@ -1202,7 +1231,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -4249,7 +4249,7 @@ +@@ -4333,7 +4333,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL @@ -1211,7 +1240,7 @@ VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -4262,7 +4262,7 @@ +@@ -4346,7 +4346,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1220,7 +1249,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4272,7 +4272,7 @@ +@@ -4356,7 +4356,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1229,7 +1258,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4357,7 +4357,7 @@ +@@ -4441,7 +4441,7 @@ VARIABLE_NAME LOG_TC_SIZE GLOBAL_VALUE_ORIGIN AUTO VARIABLE_SCOPE GLOBAL From 0e6c6d61c2b41737fae126c76187ed9b7115ae31 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 30 Jun 2017 13:37:39 +0200 Subject: [PATCH 061/102] fix main.mdl failure in --embedded --- mysql-test/r/mdl.result | 18 +++++++++--------- mysql-test/t/mdl.test | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mysql-test/r/mdl.result b/mysql-test/r/mdl.result index 1a7291d922b..d93bfd5c729 100644 --- a/mysql-test/r/mdl.result +++ b/mysql-test/r/mdl.result @@ -7,16 +7,16 @@ # CREATE TABLE t1(a INT) ENGINE=InnoDB; LOCK TABLES t1 WRITE CONCURRENT, t1 AS t2 READ; -SELECT * FROM information_schema.metadata_lock_info; -THREAD_ID LOCK_MODE LOCK_DURATION LOCK_TYPE TABLE_SCHEMA TABLE_NAME -9 MDL_INTENTION_EXCLUSIVE NULL Global read lock -9 MDL_SHARED_NO_READ_WRITE NULL Table metadata lock test t1 +SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info; +LOCK_MODE LOCK_TYPE TABLE_SCHEMA TABLE_NAME +MDL_INTENTION_EXCLUSIVE Global read lock +MDL_SHARED_NO_READ_WRITE Table metadata lock test t1 UNLOCK TABLES; LOCK TABLES t1 AS t2 READ, t1 WRITE CONCURRENT; -SELECT * FROM information_schema.metadata_lock_info; -THREAD_ID LOCK_MODE LOCK_DURATION LOCK_TYPE TABLE_SCHEMA TABLE_NAME -9 MDL_INTENTION_EXCLUSIVE NULL Global read lock -9 MDL_SHARED_WRITE NULL Table metadata lock test t1 -9 MDL_SHARED_READ_ONLY NULL Table metadata lock test t1 +SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info; +LOCK_MODE LOCK_TYPE TABLE_SCHEMA TABLE_NAME +MDL_INTENTION_EXCLUSIVE Global read lock +MDL_SHARED_WRITE Table metadata lock test t1 +MDL_SHARED_READ_ONLY Table metadata lock test t1 UNLOCK TABLES; DROP TABLE t1; diff --git a/mysql-test/t/mdl.test b/mysql-test/t/mdl.test index 1770e53b61a..b90c74a8f7f 100644 --- a/mysql-test/t/mdl.test +++ b/mysql-test/t/mdl.test @@ -11,9 +11,9 @@ CREATE TABLE t1(a INT) ENGINE=InnoDB; LOCK TABLES t1 WRITE CONCURRENT, t1 AS t2 READ; -SELECT * FROM information_schema.metadata_lock_info; +SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info; UNLOCK TABLES; LOCK TABLES t1 AS t2 READ, t1 WRITE CONCURRENT; -SELECT * FROM information_schema.metadata_lock_info; +SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info; UNLOCK TABLES; DROP TABLE t1; From 95e6dd443ad8d179e41a5bb398fe45a2385b5f9a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 10 May 2017 01:30:34 +0200 Subject: [PATCH 062/102] crashes when errors on early startup cannot use unireg_abort() until mutexes are initialized. --- sql/mysqld.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5ef01d5b26f..12863b7ae63 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4126,7 +4126,6 @@ static int init_common_variables() init_libstrings(); tzset(); // Set tzname - sf_leaking_memory= 0; // no memory leaks from now on #ifdef SAFEMALLOC sf_malloc_dbug_id= mariadb_dbug_id; #endif @@ -4140,23 +4139,22 @@ static int init_common_variables() if (!global_rpl_filter || !binlog_filter) { sql_perror("Could not allocate replication and binlog filters"); - return 1; + exit(1); } #ifdef HAVE_OPENSSL if (check_openssl_compatibility()) { sql_print_error("Incompatible OpenSSL version. Cannot continue..."); - return 1; + exit(1); } #endif - if (init_thread_environment() || - mysql_init_variables()) - return 1; + if (init_thread_environment() || mysql_init_variables()) + exit(1); if (ignore_db_dirs_init()) - return 1; + exit(1); #ifdef HAVE_TZNAME struct tm tm_tmp; @@ -4210,7 +4208,7 @@ static int init_common_variables() if (!IS_TIME_T_VALID_FOR_TIMESTAMP(server_start_time)) { sql_print_error("This MySQL server doesn't support dates later then 2038"); - return 1; + exit(1); } opt_log_basename= const_cast("mysql"); @@ -4259,7 +4257,7 @@ static int init_common_variables() new entries could be added to that list. */ if (add_status_vars(status_vars)) - return 1; // an error was already reported + exit(1); // an error was already reported #ifndef DBUG_OFF /* @@ -4290,7 +4288,7 @@ static int init_common_variables() #endif if (get_options(&remaining_argc, &remaining_argv)) - return 1; + exit(1); if (IS_SYSVAR_AUTOSIZE(&server_version_ptr)) set_server_version(server_version, sizeof(server_version)); @@ -4309,6 +4307,8 @@ static int init_common_variables() } } + sf_leaking_memory= 0; // no memory leaks from now on + #ifndef EMBEDDED_LIBRARY if (opt_abort && !opt_verbose) unireg_abort(0); From 32e3b02234ae194ed3cf689dd0bcae592f146b1c Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 11 May 2017 19:50:33 +0200 Subject: [PATCH 063/102] MDEV-11639 Server crashes in update_virtual_field, gcol.innodb_virtual_basic fails in buildbot don't use thd->query_id check in background purge threads (it doesn't work, because thd->query_id is never incremented there) instead use thd->open_tables directly, there can be only one table there anyway, and this is the table opened by this purge thread. --- sql/sql_class.cc | 8 ++++++++ storage/innobase/handler/ha_innodb.cc | 27 ++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 3ad3b6adf89..3d34f657ae3 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -4448,6 +4448,14 @@ TABLE *open_purge_table(THD *thd, const char *db, size_t dblen, DBUG_RETURN(error ? NULL : tl->table); } +TABLE *get_purge_table(THD *thd) +{ + /* see above, at most one table can be opened */ + DBUG_ASSERT(thd->open_tables == NULL || thd->open_tables->next == NULL); + return thd->open_tables; +} + + /** Find an open table in the list of prelocked tabled Used for foreign key actions, for example, in UPDATE t1 SET a=1; diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index a1093fd24fd..ac94658687a 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -132,6 +132,7 @@ void destroy_thd(MYSQL_THD thd); void reset_thd(MYSQL_THD thd); TABLE *open_purge_table(THD *thd, const char *db, size_t dblen, const char *tb, size_t tblen); +TABLE *get_purge_table(THD *thd); /** Check if user has used xtradb extended system variable that is not currently supported by innodb or marked as deprecated. */ @@ -22119,8 +22120,17 @@ innobase_find_mysql_table_for_vc( THD* thd, dict_table_t* table) { - if (table->vc_templ->mysql_table_query_id == thd_get_query_id(thd)) { - return table->vc_templ->mysql_table; + TABLE *mysql_table; + bool bg_thread = THDVAR(thd, background_thread); + + if (bg_thread) { + if ((mysql_table = get_purge_table(thd))) { + return mysql_table; + } + } else { + if (table->vc_templ->mysql_table_query_id == thd_get_query_id(thd)) { + return table->vc_templ->mysql_table; + } } char dbname[MAX_DATABASE_NAME_LEN + 1]; @@ -22150,15 +22160,14 @@ innobase_find_mysql_table_for_vc( tbnamelen = filename_to_tablename(tbname, t_tbname, MAX_TABLE_NAME_LEN + 1); - TABLE *mysql_table = find_fk_open_table(thd, t_dbname, dbnamelen, - t_tbname, tbnamelen); - - if (!mysql_table && THDVAR(thd, background_thread)) { - /* only open the table in background purge threads */ - mysql_table = open_purge_table(thd, t_dbname, dbnamelen, - t_tbname, tbnamelen); + if (bg_thread) { + return open_purge_table(thd, t_dbname, dbnamelen, + t_tbname, tbnamelen); } + mysql_table = find_fk_open_table(thd, t_dbname, dbnamelen, + t_tbname, tbnamelen); + table->vc_templ->mysql_table = mysql_table; table->vc_templ->mysql_table_query_id = thd_get_query_id(thd); return mysql_table; From 05873ffbf76f57f421d800fe571468351724ef79 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 15 May 2017 08:16:34 +0200 Subject: [PATCH 064/102] MDEV-12795 Possibly orphan mysql-test/t/mysql_plugin-master.opt --- mysql-test/t/mysql_plugin-master.opt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 mysql-test/t/mysql_plugin-master.opt diff --git a/mysql-test/t/mysql_plugin-master.opt b/mysql-test/t/mysql_plugin-master.opt deleted file mode 100644 index 061ca907902..00000000000 --- a/mysql-test/t/mysql_plugin-master.opt +++ /dev/null @@ -1 +0,0 @@ ---plugin-dir=$DAEMONEXAMPLE_DIR From 5c30fcfa2fd52df16a7f3202fda9a377a4744c18 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 31 May 2017 18:13:00 +0200 Subject: [PATCH 065/102] cleanup: C++ comments --- sql/sql_yacc.yy | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 2a9046f0ecc..a09ef5f0281 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -14998,8 +14998,9 @@ set_stmt_option_value_following_option_type_list: */ option_value_following_option_type | set_stmt_option_value_following_option_type_list ',' option_value_following_option_type + ; -// Start of option value list +/* Start of option value list */ start_option_value_list: option_value_no_option_type { @@ -15024,7 +15025,7 @@ start_option_value_list: ; -// Start of option value list, option_type was given +/* Start of option value list, option_type was given */ start_option_value_list_following_option_type: option_value_following_option_type { @@ -15039,13 +15040,13 @@ start_option_value_list_following_option_type: } ; -// Remainder of the option value list after first option value. +/* Remainder of the option value list after first option value. */ option_value_list_continued: /* empty */ | ',' option_value_list ; -// Repeating list of option values after first option value. +/* Repeating list of option values after first option value. */ option_value_list: { sp_create_assignment_lex(thd, yychar == YYEMPTY); @@ -15066,7 +15067,7 @@ option_value_list: } ; -// Wrapper around option values following the first option value in the stmt. +/* Wrapper around option values following the first option value in the stmt. */ option_value: option_type { @@ -15096,7 +15097,7 @@ opt_var_ident_type: | SESSION_SYM '.' { $$=OPT_SESSION; } ; -// Option values with preceding option_type. +/* Option values with preceding option_type. */ option_value_following_option_type: internal_variable_name equal set_expr_or_default { @@ -15120,7 +15121,7 @@ option_value_following_option_type: } ; -// Option values without preceding option_type. +/* Option values without preceding option_type. */ option_value_no_option_type: internal_variable_name equal set_expr_or_default { From c917ba1d5108ab90f861d4cd099feb515e54844d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 9 Jun 2017 14:23:45 +0200 Subject: [PATCH 066/102] fix the comparison in st_select_lex::setup_ref_array() the array only needs to be reallocated if it's smaller than needed. Being larger is ok. also: remove a duplicated check (merge error) --- sql/item.cc | 3 +-- sql/item_subselect.cc | 5 ++--- sql/sql_lex.cc | 12 +----------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/sql/item.cc b/sql/item.cc index 30778132afc..df1f66fde28 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -494,8 +494,7 @@ Item::Item(THD *thd): { enum_parsing_place place= thd->lex->current_select->parsing_place; - if (place == SELECT_LIST || - place == IN_HAVING) + if (place == SELECT_LIST || place == IN_HAVING) thd->lex->current_select->select_n_having_items++; } } diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 3c967b6f7e5..4713129c49e 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -116,9 +116,8 @@ void Item_subselect::init(st_select_lex *select_lex, do not take into account expression inside aggregate functions because they can access original table fields */ - parsing_place= (outer_select->in_sum_expr ? - NO_MATTER : - outer_select->parsing_place); + parsing_place= (outer_select->in_sum_expr ? NO_MATTER + : outer_select->parsing_place); if (unit->is_union()) engine= new subselect_union_engine(unit, result, this); else diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 9584f2aba36..21d7637ec06 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2665,16 +2665,6 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num) order_group_num) * 5; if (!ref_pointer_array.is_null()) { - /* - We need to take 'n_sum_items' into account when allocating the array, - and this may actually increase during the optimization phase due to - MIN/MAX rewrite in Item_in_subselect::single_value_transformer. - In the usual case we can reuse the array from the prepare phase. - If we need a bigger array, we must allocate a new one. - */ - if (ref_pointer_array.size() == n_elems) - return false; - /* We need to take 'n_sum_items' into account when allocating the array, and this may actually increase during the optimization phase due to @@ -2682,7 +2672,7 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num) In the usual case we can reuse the array from the prepare phase. If we need a bigger array, we must allocate a new one. */ - if (ref_pointer_array.size() == n_elems) + if (ref_pointer_array.size() >= n_elems) return false; } Item **array= static_cast(arena->alloc(sizeof(Item*) * n_elems)); From a6bef22cdade18c60f8e5f0dd88b42e97d3db3c8 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 10 Jun 2017 18:08:05 +0200 Subject: [PATCH 067/102] reduce grammar duplication --- sql/sql_yacc.yy | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a09ef5f0281..b52301943fb 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6633,19 +6633,7 @@ serial_attribute: lex->last_field->flags|= PRI_KEY_FLAG | NOT_NULL_FLAG; lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX; } - | UNIQUE_SYM - { - LEX *lex=Lex; - lex->last_field->flags|= UNIQUE_KEY_FLAG; - lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX; - } - | UNIQUE_SYM KEY_SYM - { - LEX *lex=Lex; - lex->last_field->flags|= UNIQUE_KEY_FLAG; - lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX; - } - | COMMENT_SYM TEXT_STRING_sys { Lex->last_field->comment= $2; } + | vcol_attribute | IDENT_sys equal TEXT_STRING_sys { if ($3.length > ENGINE_OPTION_MAX_LENGTH) From 93a95c0a7637f1e82389b1dba9001a41f43aee8b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 23 Jun 2017 16:19:40 +0200 Subject: [PATCH 068/102] cleanup: check_openssl_compatibility() CRYPTO_set_mem_functions() works only until the first allocation is done: * remove the second CRYPTO_set_mem_functions() call * check whether the first CRYPTO_set_mem_functions() call worked * stricter memory checks (==1, not >1, etc) * as coc_malloc cannot be removed, make the counter a bit cheaper * only do the check for OpenSSL 1.1 (because of OpenSSL 1.0 bug) --- mysys_ssl/openssl.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c index 2587c5ece1d..31d29fb06d9 100644 --- a/mysys_ssl/openssl.c +++ b/mysys_ssl/openssl.c @@ -17,8 +17,14 @@ #include #include -#ifdef HAVE_YASSL +/* + The check is only done for OpenSSL 1.1.x. + It could run for OpenSSL 1.0.x but it doesn't make much sense + and it hits this bug: + https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/1594748 +*/ +#ifndef HAVE_OPENSSL11 int check_openssl_compatibility() { return 0; @@ -26,23 +32,15 @@ int check_openssl_compatibility() #else #include -#ifdef HAVE_OPENSSL11 -typedef void *(*CRYPTO_malloc_t)(size_t, const char *, int); -#endif +static uint testing, alloc_size, alloc_count; -#ifdef HAVE_OPENSSL10 -typedef void *(*CRYPTO_malloc_t)(size_t); -#define CRYPTO_malloc malloc -#define CRYPTO_realloc realloc -#define CRYPTO_free free -#endif - -static uint allocated_size, allocated_count; - -static void *coc_malloc(size_t size) +static void *coc_malloc(size_t size, const char *, int) { - allocated_size+= size; - allocated_count++; + if (unlikely(testing)) + { + alloc_size+= size; + alloc_count++; + } return malloc(size); } @@ -51,21 +49,23 @@ int check_openssl_compatibility() EVP_CIPHER_CTX *evp_ctx; EVP_MD_CTX *md5_ctx; - CRYPTO_set_mem_functions((CRYPTO_malloc_t)coc_malloc, CRYPTO_realloc, CRYPTO_free); + if (!CRYPTO_set_mem_functions(coc_malloc, CRYPTO_realloc, CRYPTO_free)) + return 1; - allocated_size= allocated_count= 0; + testing= 1; + alloc_size= alloc_count= 0; evp_ctx= EVP_CIPHER_CTX_new(); EVP_CIPHER_CTX_free(evp_ctx); - if (allocated_count > 1 || allocated_size > EVP_CIPHER_CTX_SIZE) + if (alloc_count != 1 || !alloc_size || alloc_size > EVP_CIPHER_CTX_SIZE) return 1; - allocated_size= allocated_count= 0; + alloc_size= alloc_count= 0; md5_ctx= EVP_MD_CTX_create(); EVP_MD_CTX_destroy(md5_ctx); - if (allocated_count > 1 || allocated_size > EVP_MD_CTX_SIZE) + if (alloc_count != 1 || !alloc_size || alloc_size > EVP_MD_CTX_SIZE) return 1; - CRYPTO_set_mem_functions(CRYPTO_malloc, CRYPTO_realloc, CRYPTO_free); + testing= 0; return 0; } #endif From 9edfc00697b6b97e838d517cdb1883ea115c4746 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 23 Jun 2017 18:15:07 +0200 Subject: [PATCH 069/102] MDEV-11930 Unexpected ER_ERROR_EVALUATING_EXPRESSION warning upon dropping database with a bad table DBUG_EXECUTE_IF was wrong, it used my_error, but didn't do error=1. It's not clear what it was actually testing, what it was supposed to be testing, and what it has to do with bug#43138, so I removed it. --- mysql-test/r/drop_debug.result | 25 ---------------------- mysql-test/t/drop_debug.test | 38 ---------------------------------- sql/sql_table.cc | 4 ---- 3 files changed, 67 deletions(-) delete mode 100644 mysql-test/r/drop_debug.result delete mode 100644 mysql-test/t/drop_debug.test diff --git a/mysql-test/r/drop_debug.result b/mysql-test/r/drop_debug.result deleted file mode 100644 index 852b3ac2163..00000000000 --- a/mysql-test/r/drop_debug.result +++ /dev/null @@ -1,25 +0,0 @@ - -# -- -# -- Bug#43138: DROP DATABASE failure does not clean up message list. -# -- - -DROP DATABASE IF EXISTS mysql_test; - -CREATE DATABASE mysql_test; -CREATE TABLE mysql_test.t1(a INT); -CREATE TABLE mysql_test.t2(b INT); -CREATE TABLE mysql_test.t3(c INT); - -SET SESSION debug_dbug= "+d,bug43138"; - -DROP DATABASE mysql_test; -Warnings: -Error 1051 Unknown table 't1' -Error 1051 Unknown table 't2' -Error 1051 Unknown table 't3' - -SET SESSION debug_dbug= "-d,bug43138"; - -# -- -# -- End of Bug#43138. -# -- diff --git a/mysql-test/t/drop_debug.test b/mysql-test/t/drop_debug.test deleted file mode 100644 index 21069b57285..00000000000 --- a/mysql-test/t/drop_debug.test +++ /dev/null @@ -1,38 +0,0 @@ -# -# DROP-related tests which execution requires debug server. -# ---source include/have_debug.inc - -########################################################################### ---echo ---echo # -- ---echo # -- Bug#43138: DROP DATABASE failure does not clean up message list. ---echo # -- ---echo - ---disable_warnings -DROP DATABASE IF EXISTS mysql_test; ---enable_warnings - ---echo -CREATE DATABASE mysql_test; -CREATE TABLE mysql_test.t1(a INT); -CREATE TABLE mysql_test.t2(b INT); -CREATE TABLE mysql_test.t3(c INT); - ---echo -SET SESSION debug_dbug= "+d,bug43138"; - ---echo ---sorted_result -DROP DATABASE mysql_test; - ---echo -SET SESSION debug_dbug= "-d,bug43138"; - ---echo ---echo # -- ---echo # -- End of Bug#43138. ---echo # -- - -########################################################################### diff --git a/sql/sql_table.cc b/sql/sql_table.cc index dcae5435d57..db708ff613c 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2522,10 +2522,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists, DBUG_PRINT("table", ("table: 0x%lx s: 0x%lx", (long) table->table, table->table ? (long) table->table->s : (long) -1)); - - DBUG_EXECUTE_IF("bug43138", - my_error(ER_BAD_TABLE_ERROR, MYF(0), - table->table_name);); } DEBUG_SYNC(thd, "rm_table_no_locks_before_binlog"); thd->thread_specific_used|= (trans_tmp_table_deleted || From 7bea860709cf63d3180c934ab75d7042e0cd8867 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 24 Jun 2017 14:08:57 +0200 Subject: [PATCH 070/102] MDEV-12923 MyISAM allows CHECK constraint violation in ALTER TABLE use correct type for Alter_inplace_info flags. --- mysql-test/r/alter_table.result | 4 ++-- mysql-test/r/partition_alter.result | 4 +++- mysql-test/t/partition_alter.test | 4 +++- storage/myisam/ha_myisam.cc | 17 ++++++++++------- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index c88abd9867e..2455bc4f997 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -1925,8 +1925,8 @@ ALTER TABLE ti1 FORCE; affected rows: 0 info: Records: 0 Duplicates: 0 Warnings: 0 ALTER TABLE tm1 FORCE; -affected rows: 0 -info: Records: 0 Duplicates: 0 Warnings: 0 +affected rows: 2 +info: Records: 2 Duplicates: 0 Warnings: 0 ALTER TABLE ti1 AUTO_INCREMENT 3; affected rows: 0 info: Records: 0 Duplicates: 0 Warnings: 0 diff --git a/mysql-test/r/partition_alter.result b/mysql-test/r/partition_alter.result index 76b55cefb07..bc2c2f17c97 100644 --- a/mysql-test/r/partition_alter.result +++ b/mysql-test/r/partition_alter.result @@ -83,6 +83,8 @@ partition p2 values less than ('2020-10-19')); insert t1 values (0, '2000-01-02', 0); insert t1 values (1, '2020-01-02', 10); alter table t1 add check (b in (0, 1)); +ERROR 23000: CONSTRAINT `CONSTRAINT_1` failed for `test`.`#sql-temporary` +alter table t1 add check (b in (0, 10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -90,7 +92,7 @@ t1 CREATE TABLE `t1` ( `d` date NOT NULL, `b` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`,`d`), - CONSTRAINT `CONSTRAINT_1` CHECK (`b` in (0,1)) + CONSTRAINT `CONSTRAINT_1` CHECK (`b` in (0,10)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE COLUMNS(d) (PARTITION p1 VALUES LESS THAN ('2016-10-18') ENGINE = MyISAM, diff --git a/mysql-test/t/partition_alter.test b/mysql-test/t/partition_alter.test index 9194e9a8222..e320efcefb9 100644 --- a/mysql-test/t/partition_alter.test +++ b/mysql-test/t/partition_alter.test @@ -96,8 +96,10 @@ partition p1 values less than ('2016-10-18'), partition p2 values less than ('2020-10-19')); insert t1 values (0, '2000-01-02', 0); insert t1 values (1, '2020-01-02', 10); -# FIXME: MDEV-12923 MyISAM allows CHECK constraint violation in ALTER TABLE +--replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ +--error ER_CONSTRAINT_FAILED alter table t1 add check (b in (0, 1)); +alter table t1 add check (b in (0, 10)); show create table t1; --error ER_CONSTRAINT_FAILED insert t1 values (2, '2020-01-03', 20); diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 77d098cd9f1..28c60308ce9 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -2291,16 +2291,19 @@ ha_myisam::check_if_supported_inplace_alter(TABLE *new_table, { DBUG_ENTER("ha_myisam::check_if_supported_inplace_alter"); - const uint readd_index= Alter_inplace_info::ADD_INDEX | + const Alter_inplace_info::HA_ALTER_FLAGS readd_index= + Alter_inplace_info::ADD_INDEX | Alter_inplace_info::DROP_INDEX; - const uint readd_unique= Alter_inplace_info::ADD_UNIQUE_INDEX | - Alter_inplace_info::DROP_UNIQUE_INDEX; - const uint readd_pk= Alter_inplace_info::ADD_PK_INDEX | - Alter_inplace_info::DROP_PK_INDEX; + const Alter_inplace_info::HA_ALTER_FLAGS readd_unique= + Alter_inplace_info::ADD_UNIQUE_INDEX | + Alter_inplace_info::DROP_UNIQUE_INDEX; + const Alter_inplace_info::HA_ALTER_FLAGS readd_pk= + Alter_inplace_info::ADD_PK_INDEX | + Alter_inplace_info::DROP_PK_INDEX; - const uint op= alter_info->handler_flags; + const Alter_inplace_info::HA_ALTER_FLAGS op= alter_info->handler_flags; - if (alter_info->handler_flags & Alter_inplace_info::ALTER_COLUMN_VCOL) + if (op & Alter_inplace_info::ALTER_COLUMN_VCOL) DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); /* From 75f80004b165363b10eeb9b63c342215356c98d0 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 25 Jun 2017 20:55:58 +0200 Subject: [PATCH 071/102] MDEV-12939 A query crashes MariaDB in Item_func_regex::cleanup and MDEV-13144 regexp on views - crashed mariadb server implement Item_func_regex::build_clone() --- mysql-test/r/func_regexp_pcre.result | 2 ++ mysql-test/t/func_regexp_pcre.test | 5 +++++ sql/item_cmpfunc.cc | 3 +-- sql/item_cmpfunc.h | 20 ++++++++++++++------ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/mysql-test/r/func_regexp_pcre.result b/mysql-test/r/func_regexp_pcre.result index 266ea6c5eef..0030fa53381 100644 --- a/mysql-test/r/func_regexp_pcre.result +++ b/mysql-test/r/func_regexp_pcre.result @@ -894,3 +894,5 @@ REGEXP_INSTR('a_kollision', '(oll)') SELECT REGEXP_INSTR('a_kollision', 'o([lm])\\1'); REGEXP_INSTR('a_kollision', 'o([lm])\\1') 4 +SELECT a FROM (SELECT "aa" a) t WHERE a REGEXP '[0-9]'; +a diff --git a/mysql-test/t/func_regexp_pcre.test b/mysql-test/t/func_regexp_pcre.test index 4b2c18e0674..4cbe893d9c4 100644 --- a/mysql-test/t/func_regexp_pcre.test +++ b/mysql-test/t/func_regexp_pcre.test @@ -439,3 +439,8 @@ SELECT 1 FROM dual WHERE ('Alpha,Bravo,Charlie,Delta,Echo,Foxtrot,StrataCentral, SELECT REGEXP_INSTR('a_kollision', 'oll'); SELECT REGEXP_INSTR('a_kollision', '(oll)'); SELECT REGEXP_INSTR('a_kollision', 'o([lm])\\1'); + +# +# MDEV-12939 A query crashes MariaDB in Item_func_regex::cleanup +# +SELECT a FROM (SELECT "aa" a) t WHERE a REGEXP '[0-9]'; diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index f4fae535670..d203efa6305 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -5408,9 +5408,8 @@ bool Regexp_processor_pcre::compile(String *pattern, bool send_error) { if (!stringcmp(pattern, &m_prev_pattern)) return false; + cleanup(); m_prev_pattern.copy(*pattern); - pcre_free(m_pcre); - m_pcre= NULL; } if (!(pattern= convert_if_needed(pattern, &pattern_converter))) diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 2f98c68bb5f..8ff789d983a 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -2074,14 +2074,15 @@ public: { return subpattern_end(n) - subpattern_start(n); } + void reset() + { + m_pcre= NULL; + m_prev_pattern.length(0); + } void cleanup() { - if (m_pcre) - { - pcre_free(m_pcre); - m_pcre= NULL; - } - m_prev_pattern.length(0); + pcre_free(m_pcre); + reset(); } bool is_compiled() const { return m_pcre != NULL; } bool is_const() const { return m_is_const; } @@ -2110,6 +2111,13 @@ public: enum precedence precedence() const { return CMP_PRECEDENCE; } Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy(thd, mem_root, this); } + Item *build_clone(THD *thd, MEM_ROOT *mem_root) + { + Item_func_regex *clone= (Item_func_regex*) Item_bool_func::build_clone(thd, mem_root); + if (clone) + clone->re.reset(); + return clone; + } void print(String *str, enum_query_type query_type) { From 47687eef41b97edac423b4ff694cdd20cf804901 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 26 Jun 2017 16:26:35 +0200 Subject: [PATCH 072/102] MDEV-12936 upgrade to 10.2.6 failed upon tables with virtual columns when opening 10.1- table that has virtual columns: 1. don't error out if it has vcols over autoinc columns. just issue a warning. 2. set vcol type properly 3. in innodb: use table->s->stored_fields instead of table->s->fields, because that's what was stored in innodb data dictionary --- mysql-test/std_data/vcol_autoinc.MYD | 0 mysql-test/std_data/vcol_autoinc.MYI | Bin 0 -> 1024 bytes mysql-test/std_data/vcol_autoinc.frm | Bin 0 -> 951 bytes mysql-test/suite/vcol/r/upgrade.result | 18 +++++++++++++++++ mysql-test/suite/vcol/t/upgrade.test | 13 ++++++++++++ sql/table.cc | 10 ++++++--- storage/innobase/handler/ha_innodb.cc | 27 ++++++++++++++++--------- 7 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 mysql-test/std_data/vcol_autoinc.MYD create mode 100644 mysql-test/std_data/vcol_autoinc.MYI create mode 100644 mysql-test/std_data/vcol_autoinc.frm create mode 100644 mysql-test/suite/vcol/r/upgrade.result create mode 100644 mysql-test/suite/vcol/t/upgrade.test diff --git a/mysql-test/std_data/vcol_autoinc.MYD b/mysql-test/std_data/vcol_autoinc.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/vcol_autoinc.MYI b/mysql-test/std_data/vcol_autoinc.MYI new file mode 100644 index 0000000000000000000000000000000000000000..ddb3f2e07484ca3409f27799615b02fe213c12d7 GIT binary patch literal 1024 zcmezOkDZZ$fiZ+(149bK5e5*Ofdfba!GAD`h4>Ez5GfWcDsTyLY9Y(O%z@D`xyXPw zFQII(OOW_5CCD_ywG2eNgB7Tm9f(0R2#WwQ6A&}7u`zhDE1|Z7LJkCob_GQFC^;Ge0~!JVGs`1w literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/vcol_autoinc.frm b/mysql-test/std_data/vcol_autoinc.frm new file mode 100644 index 0000000000000000000000000000000000000000..bff7983735ca79b64107cf18c5ab59c86ca758d7 GIT binary patch literal 951 zcmeyz$jK?h5XQjBu$`HK;U^;}0~|0ZGH@_3u!8tN8UlVYGBC)tGcpLk1Q-M^DxXk~ zN)UX$`Ot!nEpysbGME?`7=g;TfJ#_^<^p*QKp|-$=YK$ur>|pB8^ zWALr?40iN|c+j8GACweEFaYKO1~DM!MC2xh0H6pcSiqT#n*p3n_!$_OA^DA)fen~% Y8i3MYfdc;vvj3ME|7T!iW+=!80BSrQ6aWAK literal 0 HcmV?d00001 diff --git a/mysql-test/suite/vcol/r/upgrade.result b/mysql-test/suite/vcol/r/upgrade.result new file mode 100644 index 00000000000..75684bf0e41 --- /dev/null +++ b/mysql-test/suite/vcol/r/upgrade.result @@ -0,0 +1,18 @@ +check table vcol_autoinc for upgrade; +Table Op Msg_type Msg_text +test.vcol_autoinc check Warning Function or expression 'AUTO_INCREMENT' cannot be used in the GENERATED ALWAYS AS clause of `pk` +test.vcol_autoinc check status OK +show create table vcol_autoinc; +Table Create Table +vcol_autoinc CREATE TABLE `vcol_autoinc` ( + `pk` int(11) NOT NULL AUTO_INCREMENT, + `v3` int(11) GENERATED ALWAYS AS (`pk`) VIRTUAL, + PRIMARY KEY (`pk`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +select * from vcol_autoinc; +pk v3 +insert vcol_autoinc (pk) values (1); +select * from vcol_autoinc; +pk v3 +1 1 +drop table vcol_autoinc; diff --git a/mysql-test/suite/vcol/t/upgrade.test b/mysql-test/suite/vcol/t/upgrade.test new file mode 100644 index 00000000000..3e221747dfa --- /dev/null +++ b/mysql-test/suite/vcol/t/upgrade.test @@ -0,0 +1,13 @@ +# +# MDEV-12936 upgrade to 10.2.6 failed upon tables with virtual columns +# +let $datadir=`select @@datadir`; +copy_file std_data/vcol_autoinc.frm $datadir/test/vcol_autoinc.frm; +copy_file std_data/vcol_autoinc.MYD $datadir/test/vcol_autoinc.MYD; +copy_file std_data/vcol_autoinc.MYI $datadir/test/vcol_autoinc.MYI; +check table vcol_autoinc for upgrade; +show create table vcol_autoinc; +select * from vcol_autoinc; +insert vcol_autoinc (pk) values (1); +select * from vcol_autoinc; +drop table vcol_autoinc; diff --git a/sql/table.cc b/sql/table.cc index 10a94dd8212..45a2966407a 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1860,7 +1860,9 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, interval_nr= (uint)vcol_screen_pos[3]; else if ((uint)vcol_screen_pos[0] != 1) goto err; - vcol_info->stored_in_db= vcol_screen_pos[2] & 1; + bool stored= vcol_screen_pos[2] & 1; + vcol_info->stored_in_db= stored; + vcol_info->set_vcol_type(stored ? VCOL_GENERATED_STORED : VCOL_GENERATED_VIRTUAL); vcol_expr_length= vcol_info_length - (uint)(FRM_VCOL_OLD_HEADER_SIZE(opt_interval_id)); vcol_info->utf8= 0; // before 10.2.1 the charset was unknown @@ -2862,9 +2864,11 @@ static bool fix_and_check_vcol_expr(THD *thd, TABLE *table, of the statement because the field item does not have a field pointer at that time */ - my_error(ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED, MYF(0), + myf warn= table->s->frm_version < FRM_VER_EXPRESSSIONS ? ME_JUST_WARNING : 0; + my_error(ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED, MYF(warn), "AUTO_INCREMENT", vcol->get_vcol_type_name(), res.name); - DBUG_RETURN(1); + if (!warn) + DBUG_RETURN(1); } vcol->flags= res.errors; diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index ac94658687a..68b69e94681 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -291,6 +291,11 @@ void set_my_errno(int err) errno = err; } +static uint mysql_fields(const TABLE *table) +{ + return table->s->frm_version < FRM_VER_EXPRESSSIONS + ? table->s->stored_fields : table->s->fields; +} /** Checks whether the file name belongs to a partition of a table. @param[in] file_name file name @@ -6495,16 +6500,17 @@ ha_innobase::open(const char* name, int, uint) ib_table = open_dict_table(name, norm_name, is_part, ignore_err); + uint n_fields = mysql_fields(table); + if (ib_table != NULL && ((!DICT_TF2_FLAG_IS_SET(ib_table, DICT_TF2_FTS_HAS_DOC_ID) - && table->s->fields != dict_table_get_n_tot_u_cols(ib_table)) + && n_fields != dict_table_get_n_tot_u_cols(ib_table)) || (DICT_TF2_FLAG_IS_SET(ib_table, DICT_TF2_FTS_HAS_DOC_ID) - && (table->s->fields - != dict_table_get_n_tot_u_cols(ib_table) - 1)))) { + && (n_fields != dict_table_get_n_tot_u_cols(ib_table) - 1)))) { ib::warn() << "Table " << norm_name << " contains " - << dict_table_get_n_user_cols(ib_table) << " user" - " defined columns in InnoDB, but " << table->s->fields + << dict_table_get_n_tot_u_cols(ib_table) << " user" + " defined columns in InnoDB, but " << n_fields << " columns in MariaDB. Please check" " INFORMATION_SCHEMA.INNODB_SYS_COLUMNS and " REFMAN "innodb-troubleshooting.html for how to resolve the" @@ -8033,7 +8039,7 @@ ha_innobase::build_template( /* Below we check column by column if we need to access the clustered index. */ - n_fields = (ulint) table->s->fields; /* number of columns */ + n_fields = (ulint) mysql_fields(table); if (!m_prebuilt->mysql_template) { m_prebuilt->mysql_template = (mysql_row_templ_t*) @@ -8894,6 +8900,7 @@ calc_row_difference( trx_t* const trx = prebuilt->trx; doc_id_t doc_id = FTS_NULL_DOC_ID; ulint num_v = 0; + uint n_fields = mysql_fields(table); ut_ad(!srv_read_only_mode); @@ -8903,7 +8910,7 @@ calc_row_difference( /* We use upd_buff to convert changed fields */ buf = (byte*) upd_buff; - for (i = 0; i < table->s->fields; i++) { + for (i = 0; i < n_fields; i++) { field = table->field[i]; bool is_virtual = innobase_is_v_fld(field); dict_col_t* col; @@ -9285,7 +9292,7 @@ wsrep_calc_row_hash( void *ctx = alloca(my_md5_context_size()); my_md5_init(ctx); - n_fields = table->s->fields; + n_fields = mysql_fields(table); for (i = 0; i < n_fields; i++) { byte null_byte=0; @@ -11352,7 +11359,9 @@ create_table_check_doc_id_col( ULINT_UNDEFINED if column is of the wrong type/name/size */ { - for (ulint i = 0; i < form->s->fields; i++) { + uint n_fields = mysql_fields(form); + + for (ulint i = 0; i < n_fields; i++) { const Field* field; ulint col_type; ulint col_len; From 2bf017c210d00e3cea281aee9f241a01a3f85b7f Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 26 Jun 2017 20:06:12 +0200 Subject: [PATCH 073/102] MDEV-13060 Server Audit Plugin Crashes with AWS KMS plugin don't do auditing if thd is NULL. Collaterals: * copy-paste bugs server_audit.c * uninitialized user field when thd in NULL --- plugin/server_audit/server_audit.c | 6 +++--- sql/sql_audit.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index ee00c9e1385..65de695ac9e 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -1145,7 +1145,7 @@ static void setup_connection_initdb(struct connection_info *cn, } else { - get_str_n(cn->user, &cn->user_length, sizeof(cn->db), + get_str_n(cn->user, &cn->user_length, sizeof(cn->user), uh_buffer, user_len); get_str_n(cn->host, &cn->host_length, sizeof(cn->host), uh_buffer+user_len+1, host_len); @@ -1196,7 +1196,7 @@ static void setup_connection_query(struct connection_info *cn, } else { - get_str_n(cn->user, &cn->user_length, sizeof(cn->db), + get_str_n(cn->user, &cn->user_length, sizeof(cn->user), uh_buffer, user_len); get_str_n(cn->host, &cn->host_length, sizeof(cn->host), uh_buffer+user_len+1, host_len); @@ -1956,7 +1956,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev) /* That one is important as this function can be called with */ /* &lock_operations locked when the server logs an error reported */ /* by this plugin. */ - if (internal_stop_logging) + if (!thd || internal_stop_logging) return; flogger_mutex_lock(&lock_operations); diff --git a/sql/sql_audit.h b/sql/sql_audit.h index 5f530c676c3..f7ad8d3cd20 100644 --- a/sql/sql_audit.h +++ b/sql/sql_audit.h @@ -170,6 +170,8 @@ void mysql_audit_general(THD *thd, uint event_subtype, } else { + event.general_user= NULL; + event.general_user_length= 0; event.general_thread_id= 0; event.general_query= NULL; event.general_query_length= 0; From 03c52e964f6ed16b02d01f37428cdd987bba0e92 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 27 Jun 2017 20:44:32 +0200 Subject: [PATCH 074/102] cleanup: move Virtual_column_info::print out of Virtual_column_info --- sql/field.h | 2 +- sql/item.cc | 11 ----------- sql/item.h | 22 ++++++++++++++++++++++ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/sql/field.h b/sql/field.h index 14f14afdaf7..18d66ed8891 100644 --- a/sql/field.h +++ b/sql/field.h @@ -681,7 +681,7 @@ public: in_partitioning_expr= TRUE; } inline bool is_equal(const Virtual_column_info* vcol) const; - void print(String*); + inline void print(String*); }; class Field: public Value_source diff --git a/sql/item.cc b/sql/item.cc index df1f66fde28..12935a43bea 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -10715,14 +10715,3 @@ void Item::register_in(THD *thd) next= thd->free_list; thd->free_list= this; } - -void Virtual_column_info::print(String *str) -{ - expr->print_parenthesised(str, - (enum_query_type)(QT_ITEM_ORIGINAL_FUNC_NULLIF | - QT_ITEM_IDENT_SKIP_DB_NAMES | - QT_ITEM_IDENT_SKIP_TABLE_NAMES | - QT_NO_DATA_EXPANSION | - QT_TO_SYSTEM_CHARSET), - LOWEST_PRECEDENCE); -} diff --git a/sql/item.h b/sql/item.h index 02e4b2e3468..fc606e766f1 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1292,6 +1292,23 @@ public: virtual enum precedence precedence() const { return DEFAULT_PRECEDENCE; } void print_parenthesised(String *str, enum_query_type query_type, enum precedence parent_prec); + /** + This helper is used to print expressions as a part of a table definition, + in particular for + - generated columns + - check constraints + - default value expressions + */ + void print_for_table_def(String *str) + { + print_parenthesised(str, + (enum_query_type)(QT_ITEM_ORIGINAL_FUNC_NULLIF | + QT_ITEM_IDENT_SKIP_DB_NAMES | + QT_ITEM_IDENT_SKIP_TABLE_NAMES | + QT_NO_DATA_EXPANSION | + QT_TO_SYSTEM_CHARSET), + LOWEST_PRECEDENCE); + } virtual void print(String *str, enum_query_type query_type); void print_item_w_name(String *str, enum_query_type query_type); void print_value(String *str); @@ -5977,4 +5994,9 @@ inline bool Virtual_column_info::is_equal(const Virtual_column_info* vcol) const && expr->eq(vcol->expr, true); } +inline void Virtual_column_info::print(String* str) +{ + expr->print_for_table_def(str); +} + #endif /* SQL_ITEM_INCLUDED */ From 504eff0ca13ef93fa46f919e1fb60b58ac9a34eb Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 28 Jun 2017 12:50:18 +0200 Subject: [PATCH 075/102] cleanup: generate_partition_syntax() Don't write to a temporary file, use String. Remove strange one-liner "helpers", use String methods. Don't use current_thd, don't allocate memory for 1-byte strings, etc. --- sql/ha_partition.cc | 2 - sql/ha_partition.h | 7 - sql/partition_info.cc | 4 +- sql/sql_partition.cc | 526 +++++++++--------------------------- sql/sql_partition.h | 7 +- sql/sql_show.cc | 41 +-- sql/sql_string.cc | 8 + sql/sql_string.h | 1 + sql/sql_table.cc | 18 +- storage/spider/spd_table.cc | 3 +- 10 files changed, 168 insertions(+), 449 deletions(-) diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 7f156c80205..6099f40ba0c 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -9053,8 +9053,6 @@ int ha_partition::check_for_upgrade(HA_CHECK_OPT *check_opt) !(part_buf= generate_partition_syntax(thd, m_part_info, &part_buf_len, true, - true, - NULL, NULL, NULL)) || print_admin_msg(thd, SQL_ADMIN_MSG_TEXT_SIZE + 1, "error", diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 70cd3760783..a5a584287cf 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -21,13 +21,6 @@ #include "sql_partition.h" /* part_id_range, partition_element */ #include "queues.h" /* QUEUE */ -enum partition_keywords -{ - PKW_HASH= 0, PKW_RANGE, PKW_LIST, PKW_KEY, PKW_MAXVALUE, PKW_LINEAR, - PKW_COLUMNS, PKW_ALGORITHM -}; - - #define PARTITION_BYTES_IN_POS 2 diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 24506434a76..b2588c375e5 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -394,9 +394,9 @@ bool partition_info::set_up_default_partitions(THD *thd, handler *file, { const char *error_string; if (part_type == RANGE_PARTITION) - error_string= partition_keywords[PKW_RANGE].str; + error_string= "RANGE"; else - error_string= partition_keywords[PKW_LIST].str; + error_string= "LIST"; my_error(ER_PARTITIONS_MUST_BE_DEFINED_ERROR, MYF(0), error_string); goto end; } diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 0a146aeb12b..c3f2d8ec14e 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -83,27 +83,6 @@ using std::min; /* Partition related functions declarations and some static constants; */ -const LEX_STRING partition_keywords[]= -{ - { C_STRING_WITH_LEN("HASH") }, - { C_STRING_WITH_LEN("RANGE") }, - { C_STRING_WITH_LEN("LIST") }, - { C_STRING_WITH_LEN("KEY") }, - { C_STRING_WITH_LEN("MAXVALUE") }, - { C_STRING_WITH_LEN("LINEAR ") }, - { C_STRING_WITH_LEN(" COLUMNS") }, - { C_STRING_WITH_LEN("ALGORITHM") } - -}; -static const char *part_str= "PARTITION"; -static const char *sub_str= "SUB"; -static const char *by_str= "BY"; -static const char *space_str= " "; -static const char *equal_str= "="; -static const char *end_paren_str= ")"; -static const char *begin_paren_str= "("; -static const char *comma_str= ","; - static int get_partition_id_list_col(partition_info *, uint32 *, longlong *); static int get_partition_id_list(partition_info *, uint32 *, longlong *); static int get_partition_id_range_col(partition_info *, uint32 *, longlong *); @@ -1675,13 +1654,13 @@ bool fix_partition_func(THD *thd, TABLE *table, part_info->fixed= TRUE; if (part_info->part_type == RANGE_PARTITION) { - error_str= partition_keywords[PKW_RANGE].str; + error_str= "HASH"; if (unlikely(part_info->check_range_constants(thd))) goto end; } else if (part_info->part_type == LIST_PARTITION) { - error_str= partition_keywords[PKW_LIST].str; + error_str= "LIST"; if (unlikely(part_info->check_list_constants(thd))) goto end; } @@ -1759,160 +1738,48 @@ end: ALTER TABLE commands. Finally it is used for SHOW CREATE TABLES. */ -static int add_write(File fptr, const char *buf, uint len) +static int add_part_field_list(THD *thd, String *str, List field_list) { - uint ret_code= mysql_file_write(fptr, (const uchar*)buf, len, MYF(MY_FNABP)); - - if (likely(ret_code == 0)) - return 0; - else - return 1; -} - -static int add_string_object(File fptr, String *string) -{ - return add_write(fptr, string->ptr(), string->length()); -} - -static int add_string(File fptr, const char *string) -{ - return add_write(fptr, string, strlen(string)); -} - -static int add_string_len(File fptr, const char *string, uint len) -{ - return add_write(fptr, string, len); -} - -static int add_space(File fptr) -{ - return add_string(fptr, space_str); -} - -static int add_comma(File fptr) -{ - return add_string(fptr, comma_str); -} - -static int add_equal(File fptr) -{ - return add_string(fptr, equal_str); -} - -static int add_end_parenthesis(File fptr) -{ - return add_string(fptr, end_paren_str); -} - -static int add_begin_parenthesis(File fptr) -{ - return add_string(fptr, begin_paren_str); -} - -static int add_part_key_word(File fptr, const char *key_string) -{ - int err= add_string(fptr, key_string); - err+= add_space(fptr); - return err; -} - -static int add_partition(File fptr) -{ - char buff[22]; - strxmov(buff, part_str, space_str, NullS); - return add_string(fptr, buff); -} - -static int add_subpartition(File fptr) -{ - int err= add_string(fptr, sub_str); - - return err + add_partition(fptr); -} - -static int add_partition_by(File fptr) -{ - char buff[22]; - strxmov(buff, part_str, space_str, by_str, space_str, NullS); - return add_string(fptr, buff); -} - -static int add_subpartition_by(File fptr) -{ - int err= add_string(fptr, sub_str); - - return err + add_partition_by(fptr); -} - -static int add_part_field_list(File fptr, List field_list) -{ - uint i, num_fields; int err= 0; - + const char *field_name; List_iterator part_it(field_list); - num_fields= field_list.elements; - i= 0; - err+= add_begin_parenthesis(fptr); - while (i < num_fields) + + err+= str->append('('); + while ((field_name= part_it++)) { - const char *field_str= part_it++; - String field_string("", 0, system_charset_info); - THD *thd= current_thd; - ulonglong save_options= thd->variables.option_bits; - thd->variables.option_bits&= ~OPTION_QUOTE_SHOW_CREATE; - append_identifier(thd, &field_string, field_str, - strlen(field_str)); - thd->variables.option_bits= save_options; - err+= add_string_object(fptr, &field_string); - if (i != (num_fields-1)) - err+= add_comma(fptr); - i++; + err+= append_identifier(thd, str, field_name, strlen(field_name)); + err+= str->append(','); } - err+= add_end_parenthesis(fptr); + if (field_list.elements) + str->length(str->length()-1); + err+= str->append(')'); return err; } -static int add_name_string(File fptr, const char *name) -{ - int err; - String name_string("", 0, system_charset_info); - THD *thd= current_thd; - ulonglong save_options= thd->variables.option_bits; - thd->variables.option_bits&= ~OPTION_QUOTE_SHOW_CREATE; - append_identifier(thd, &name_string, name, - strlen(name)); - thd->variables.option_bits= save_options; - err= add_string_object(fptr, &name_string); - return err; -} - -static int add_int(File fptr, longlong number) -{ - char buff[32]; - llstr(number, buff); - return add_string(fptr, buff); -} - -static int add_uint(File fptr, ulonglong number) -{ - char buff[32]; - longlong2str(number, buff, 10); - return add_string(fptr, buff); -} - /* Must escape strings in partitioned tables frm-files, parsing it later with mysql_unpack_partition will fail otherwise. */ -static int add_quoted_string(File fptr, const char *quotestr) + +static int add_keyword_string(String *str, const char *keyword, + bool quoted, const char *keystr) { - String escapedstr; - int err= add_string(fptr, "'"); - err+= escapedstr.append_for_single_quote(quotestr); - err+= add_string(fptr, escapedstr.c_ptr_safe()); - return err + add_string(fptr, "'"); + int err= str->append(' '); + err+= str->append(keyword); + + str->append(STRING_WITH_LEN(" = ")); + if (quoted) + { + err+= str->append('\''); + err+= str->append_for_single_quote(keystr); + err+= str->append('\''); + } + else + err+= str->append(keystr); + return err; } + /** @brief Truncate the partition file name from a path it it exists. @@ -1945,7 +1812,6 @@ void truncate_partition_filename(char *path) } } - /** @brief Output a filepath. Similar to add_keyword_string except it also converts \ to / on Windows and skips the partition file name at @@ -1957,15 +1823,9 @@ table. So when the storage engine is asked for the DATA DIRECTORY string after a restart through Handler::update_create_options(), the storage engine may include the filename. */ -static int add_keyword_path(File fptr, const char *keyword, +static int add_keyword_path(String *str, const char *keyword, const char *path) { - int err= add_string(fptr, keyword); - - err+= add_space(fptr); - err+= add_equal(fptr); - err+= add_space(fptr); - char temp_path[FN_REFLEN]; strcpy(temp_path, path); #ifdef __WIN__ @@ -1985,73 +1845,44 @@ static int add_keyword_path(File fptr, const char *keyword, */ truncate_partition_filename(temp_path); - err+= add_quoted_string(fptr, temp_path); - - return err + add_space(fptr); + return add_keyword_string(str, keyword, true, temp_path); } -static int add_keyword_string(File fptr, const char *keyword, - bool should_use_quotes, - const char *keystr) +static int add_keyword_int(String *str, const char *keyword, longlong num) { - int err= add_string(fptr, keyword); - - err+= add_space(fptr); - err+= add_equal(fptr); - err+= add_space(fptr); - if (should_use_quotes) - err+= add_quoted_string(fptr, keystr); - else - err+= add_string(fptr, keystr); - return err + add_space(fptr); + int err= str->append(' '); + err+= str->append(keyword); + str->append(STRING_WITH_LEN(" = ")); + return err + str->append_longlong(num); } -static int add_keyword_int(File fptr, const char *keyword, longlong num) -{ - int err= add_string(fptr, keyword); - - err+= add_space(fptr); - err+= add_equal(fptr); - err+= add_space(fptr); - err+= add_int(fptr, num); - return err + add_space(fptr); -} - -static int add_engine(File fptr, handlerton *engine_type) -{ - const char *engine_str= ha_resolve_storage_engine_name(engine_type); - DBUG_PRINT("info", ("ENGINE: %s", engine_str)); - int err= add_string(fptr, "ENGINE = "); - return err + add_string(fptr, engine_str); -} - -static int add_partition_options(File fptr, partition_element *p_elem) +static int add_partition_options(String *str, partition_element *p_elem) { int err= 0; - err+= add_space(fptr); if (p_elem->tablespace_name) - err+= add_keyword_string(fptr,"TABLESPACE", FALSE, - p_elem->tablespace_name); + err+= add_keyword_string(str,"TABLESPACE", false, p_elem->tablespace_name); if (p_elem->nodegroup_id != UNDEF_NODEGROUP) - err+= add_keyword_int(fptr,"NODEGROUP",(longlong)p_elem->nodegroup_id); + err+= add_keyword_int(str,"NODEGROUP",(longlong)p_elem->nodegroup_id); if (p_elem->part_max_rows) - err+= add_keyword_int(fptr,"MAX_ROWS",(longlong)p_elem->part_max_rows); + err+= add_keyword_int(str,"MAX_ROWS",(longlong)p_elem->part_max_rows); if (p_elem->part_min_rows) - err+= add_keyword_int(fptr,"MIN_ROWS",(longlong)p_elem->part_min_rows); + err+= add_keyword_int(str,"MIN_ROWS",(longlong)p_elem->part_min_rows); if (!(current_thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE)) { if (p_elem->data_file_name) - err+= add_keyword_path(fptr, "DATA DIRECTORY", p_elem->data_file_name); + err+= add_keyword_path(str, "DATA DIRECTORY", p_elem->data_file_name); if (p_elem->index_file_name) - err+= add_keyword_path(fptr, "INDEX DIRECTORY", p_elem->index_file_name); + err+= add_keyword_path(str, "INDEX DIRECTORY", p_elem->index_file_name); } if (p_elem->part_comment) - err+= add_keyword_string(fptr, "COMMENT", TRUE, p_elem->part_comment); + err+= add_keyword_string(str, "COMMENT", true, p_elem->part_comment); if (p_elem->connect_string.length) - err+= add_keyword_string(fptr, "CONNECTION", TRUE, + err+= add_keyword_string(str, "CONNECTION", true, p_elem->connect_string.str); - return err + add_engine(fptr,p_elem->engine_type); + err += add_keyword_string(str, "ENGINE", false, + ha_resolve_storage_engine_name(p_elem->engine_type)); + return err; } @@ -2162,7 +1993,7 @@ static Create_field* get_sql_field(char *field_name, } -static int add_column_list_values(File fptr, partition_info *part_info, +static int add_column_list_values(String *str, partition_info *part_info, part_elem_value *list_value, HA_CREATE_INFO *create_info, Alter_info *alter_info) @@ -2175,25 +2006,22 @@ static int add_column_list_values(File fptr, partition_info *part_info, part_info->num_columns > 1U); if (use_parenthesis) - err+= add_begin_parenthesis(fptr); + err+= str->append('('); for (i= 0; i < num_elements; i++) { part_column_list_val *col_val= &list_value->col_val_array[i]; char *field_name= it++; if (col_val->max_value) - err+= add_string(fptr, partition_keywords[PKW_MAXVALUE].str); + err+= str->append(STRING_WITH_LEN("MAXVALUE")); else if (col_val->null_value) - err+= add_string(fptr, "NULL"); + err+= str->append(STRING_WITH_LEN("NULL")); else { - char buffer[MAX_KEY_LENGTH]; - String str(buffer, sizeof(buffer), &my_charset_bin); Item *item_expr= col_val->item_expression; if (item_expr->null_value) - err+= add_string(fptr, "NULL"); + err+= str->append(STRING_WITH_LEN("NULL")); else { - String *res; CHARSET_INFO *field_cs; bool need_cs_check= FALSE; Item_result result_type= STRING_RESULT; @@ -2254,27 +2082,28 @@ static int add_column_list_values(File fptr, partition_info *part_info, } } { - String val_conv; + StringBuffer buf; + String val_conv, *res; val_conv.set_charset(system_charset_info); - res= item_expr->val_str(&str); + res= item_expr->val_str(&buf); if (get_cs_converted_part_value_from_string(current_thd, item_expr, res, &val_conv, field_cs, (bool)(alter_info != NULL))) return 1; - err+= add_string_object(fptr, &val_conv); + err+= str->append(val_conv); } } } if (i != (num_elements - 1)) - err+= add_string(fptr, comma_str); + err+= str->append(','); } if (use_parenthesis) - err+= add_end_parenthesis(fptr); + err+= str->append(')'); return err; } -static int add_partition_values(File fptr, partition_info *part_info, +static int add_partition_values(String *str, partition_info *part_info, partition_element *p_elem, HA_CREATE_INFO *create_info, Alter_info *alter_info) @@ -2283,29 +2112,29 @@ static int add_partition_values(File fptr, partition_info *part_info, if (part_info->part_type == RANGE_PARTITION) { - err+= add_string(fptr, " VALUES LESS THAN "); + err+= str->append(STRING_WITH_LEN(" VALUES LESS THAN ")); if (part_info->column_list) { List_iterator list_val_it(p_elem->list_val_list); part_elem_value *list_value= list_val_it++; - err+= add_begin_parenthesis(fptr); - err+= add_column_list_values(fptr, part_info, list_value, + err+= str->append('('); + err+= add_column_list_values(str, part_info, list_value, create_info, alter_info); - err+= add_end_parenthesis(fptr); + err+= str->append(')'); } else { if (!p_elem->max_value) { - err+= add_begin_parenthesis(fptr); + err+= str->append('('); if (p_elem->signed_flag) - err+= add_int(fptr, p_elem->range_value); + err+= str->append_longlong(p_elem->range_value); else - err+= add_uint(fptr, p_elem->range_value); - err+= add_end_parenthesis(fptr); + err+= str->append_ulonglong(p_elem->range_value); + err+= str->append(')'); } else - err+= add_string(fptr, partition_keywords[PKW_MAXVALUE].str); + err+= str->append(STRING_WITH_LEN("MAXVALUE")); } } else if (part_info->part_type == LIST_PARTITION) @@ -2317,23 +2146,23 @@ static int add_partition_values(File fptr, partition_info *part_info, { DBUG_ASSERT(part_info->defined_max_value || current_thd->lex->sql_command == SQLCOM_ALTER_TABLE); - err+= add_string(fptr, " DEFAULT"); + err+= str->append(STRING_WITH_LEN(" DEFAULT")); return err; } - err+= add_string(fptr, " VALUES IN "); + err+= str->append(STRING_WITH_LEN(" VALUES IN ")); uint num_items= p_elem->list_val_list.elements; - err+= add_begin_parenthesis(fptr); + err+= str->append('('); if (p_elem->has_null_value) { - err+= add_string(fptr, "NULL"); + err+= str->append(STRING_WITH_LEN("NULL")); if (num_items == 0) { - err+= add_end_parenthesis(fptr); + err+= str->append(')'); goto end; } - err+= add_comma(fptr); + err+= str->append(','); } i= 0; do @@ -2341,19 +2170,19 @@ static int add_partition_values(File fptr, partition_info *part_info, part_elem_value *list_value= list_val_it++; if (part_info->column_list) - err+= add_column_list_values(fptr, part_info, list_value, + err+= add_column_list_values(str, part_info, list_value, create_info, alter_info); else { if (!list_value->unsigned_flag) - err+= add_int(fptr, list_value->value); + err+= str->append_longlong(list_value->value); else - err+= add_uint(fptr, list_value->value); + err+= str->append_ulonglong(list_value->value); } if (i != (num_items-1)) - err+= add_comma(fptr); + err+= str->append(','); } while (++i < num_items); - err+= add_end_parenthesis(fptr); + err+= str->append(')'); } end: return err; @@ -2363,49 +2192,24 @@ end: /** Add 'KEY' word, with optional 'ALGORTIHM = N'. - @param fptr File to write to. + @param str String to write to. @param part_info partition_info holding the used key_algorithm - @param current_comment_start NULL, or comment string encapsulating the - PARTITION BY clause. @return Operation status. @retval 0 Success @retval != 0 Failure */ -static int add_key_with_algorithm(File fptr, partition_info *part_info, - const char *current_comment_start) +static int add_key_with_algorithm(String *str, partition_info *part_info) { int err= 0; - err+= add_part_key_word(fptr, partition_keywords[PKW_KEY].str); + err+= str->append(STRING_WITH_LEN("KEY ")); - /* - current_comment_start is given when called from SHOW CREATE TABLE, - Then only add ALGORITHM = 1, not the default 2 or non-set 0! - For .frm current_comment_start is NULL, then add ALGORITHM if != 0. - */ - if (part_info->key_algorithm == partition_info::KEY_ALGORITHM_51 || // SHOW - (!current_comment_start && // .frm - (part_info->key_algorithm != partition_info::KEY_ALGORITHM_NONE))) + if (part_info->key_algorithm == partition_info::KEY_ALGORITHM_51) { - /* If we already are within a comment, end that comment first. */ - if (current_comment_start) - err+= add_string(fptr, "*/ "); - err+= add_string(fptr, "/*!50611 "); - err+= add_part_key_word(fptr, partition_keywords[PKW_ALGORITHM].str); - err+= add_equal(fptr); - err+= add_space(fptr); - err+= add_int(fptr, part_info->key_algorithm); - err+= add_space(fptr); - err+= add_string(fptr, "*/ "); - if (current_comment_start) - { - /* Skip new line. */ - if (current_comment_start[0] == '\n') - current_comment_start++; - err+= add_string(fptr, current_comment_start); - err+= add_space(fptr); - } + err+= str->append(STRING_WITH_LEN("ALGORITHM = ")); + err+= str->append_longlong(part_info->key_algorithm); + err+= str->append(' '); } return err; } @@ -2420,8 +2224,6 @@ static int add_key_with_algorithm(File fptr, partition_info *part_info, generate_partition_syntax() part_info The partitioning data structure buf_length A pointer to the returned buffer length - use_sql_alloc Allocate buffer from sql_alloc if true - otherwise use my_malloc show_partition_options Should we display partition options create_info Info generated by parser alter_info Info generated by parser @@ -2438,64 +2240,45 @@ static int add_key_with_algorithm(File fptr, partition_info *part_info, type ALTER TABLE commands focusing on changing the PARTITION structure in any fashion. - The implementation writes the syntax to a temporary file (essentially - an abstraction of a dynamic array) and if all writes goes well it - allocates a buffer and writes the syntax into this one and returns it. - - As a security precaution the file is deleted before writing into it. This - means that no other processes on the machine can open and read the file - while this processing is ongoing. - The code is optimised for minimal code size since it is not used in any common queries. */ char *generate_partition_syntax(THD *thd, partition_info *part_info, uint *buf_length, - bool use_sql_alloc, bool show_partition_options, HA_CREATE_INFO *create_info, - Alter_info *alter_info, - const char *current_comment_start) + Alter_info *alter_info) { uint i,j, tot_num_parts, num_subparts; partition_element *part_elem; - ulonglong buffer_length; - char path[FN_REFLEN]; int err= 0; List_iterator part_it(part_info->partitions); - File fptr; - char *buf= NULL; //Return buffer + ulonglong save_options= thd->variables.option_bits; + StringBuffer<1024> str; DBUG_ENTER("generate_partition_syntax"); - if (unlikely(((fptr= create_temp_file(path,mysql_tmpdir,"psy", - O_RDWR | O_BINARY | O_TRUNC | - O_TEMPORARY, MYF(MY_WME)))) < 0)) - DBUG_RETURN(NULL); -#ifndef __WIN__ - unlink(path); -#endif - err+= add_space(fptr); - err+= add_partition_by(fptr); + thd->variables.option_bits&= ~OPTION_QUOTE_SHOW_CREATE; + + err+= str.append(STRING_WITH_LEN(" PARTITION BY ")); switch (part_info->part_type) { case RANGE_PARTITION: - err+= add_part_key_word(fptr, partition_keywords[PKW_RANGE].str); + err+= str.append(STRING_WITH_LEN("RANGE ")); break; case LIST_PARTITION: - err+= add_part_key_word(fptr, partition_keywords[PKW_LIST].str); + err+= str.append(STRING_WITH_LEN("LIST ")); break; case HASH_PARTITION: if (part_info->linear_hash_ind) - err+= add_string(fptr, partition_keywords[PKW_LINEAR].str); + err+= str.append(STRING_WITH_LEN("LINEAR ")); if (part_info->list_of_part_fields) { - err+= add_key_with_algorithm(fptr, part_info, - current_comment_start); - err+= add_part_field_list(fptr, part_info->part_field_list); + err+= add_key_with_algorithm(&str, part_info); + err+= add_part_field_list(thd, &str, part_info->part_field_list); } else - err+= add_part_key_word(fptr, partition_keywords[PKW_HASH].str); + err+= str.append(STRING_WITH_LEN("HASH ")); break; default: DBUG_ASSERT(0); @@ -2505,51 +2288,45 @@ char *generate_partition_syntax(THD *thd, partition_info *part_info, } if (part_info->part_expr) { - err+= add_begin_parenthesis(fptr); - err+= add_string_len(fptr, part_info->part_func_string, - part_info->part_func_len); - err+= add_end_parenthesis(fptr); + err+= str.append('('); + err+= str.append(part_info->part_func_string, part_info->part_func_len); + err+= str.append(')'); } else if (part_info->column_list) { - err+= add_string(fptr, partition_keywords[PKW_COLUMNS].str); - err+= add_part_field_list(fptr, part_info->part_field_list); + err+= str.append(STRING_WITH_LEN(" COLUMNS")); + err+= add_part_field_list(thd, &str, part_info->part_field_list); } if ((!part_info->use_default_num_partitions) && part_info->use_default_partitions) { - err+= add_string(fptr, "\n"); - err+= add_string(fptr, "PARTITIONS "); - err+= add_int(fptr, part_info->num_parts); + err+= str.append(STRING_WITH_LEN("\nPARTITIONS ")); + err+= str.append_ulonglong(part_info->num_parts); } if (part_info->is_sub_partitioned()) { - err+= add_string(fptr, "\n"); - err+= add_subpartition_by(fptr); + err+= str.append(STRING_WITH_LEN("\nSUBPARTITION BY ")); /* Must be hash partitioning for subpartitioning */ if (part_info->linear_hash_ind) - err+= add_string(fptr, partition_keywords[PKW_LINEAR].str); + err+= str.append(STRING_WITH_LEN("LINEAR ")); if (part_info->list_of_subpart_fields) { - err+= add_key_with_algorithm(fptr, part_info, - current_comment_start); - err+= add_part_field_list(fptr, part_info->subpart_field_list); + err+= add_key_with_algorithm(&str, part_info); + err+= add_part_field_list(thd, &str, part_info->subpart_field_list); } else - err+= add_part_key_word(fptr, partition_keywords[PKW_HASH].str); + err+= str.append(STRING_WITH_LEN("HASH ")); if (part_info->subpart_expr) { - err+= add_begin_parenthesis(fptr); - err+= add_string_len(fptr, part_info->subpart_func_string, - part_info->subpart_func_len); - err+= add_end_parenthesis(fptr); + err+= str.append('('); + err+= str.append(part_info->subpart_func_string, part_info->subpart_func_len); + err+= str.append(')'); } if ((!part_info->use_default_num_subpartitions) && part_info->use_default_subpartitions) { - err+= add_string(fptr, "\n"); - err+= add_string(fptr, "SUBPARTITIONS "); - err+= add_int(fptr, part_info->num_subparts); + err+= str.append(STRING_WITH_LEN("\nSUBPARTITIONS ")); + err+= str.append_ulonglong(part_info->num_subparts); } } tot_num_parts= part_info->partitions.elements; @@ -2558,8 +2335,7 @@ char *generate_partition_syntax(THD *thd, partition_info *part_info, if (!part_info->use_default_partitions) { bool first= TRUE; - err+= add_string(fptr, "\n"); - err+= add_begin_parenthesis(fptr); + err+= str.append(STRING_WITH_LEN("\n(")); i= 0; do { @@ -2568,80 +2344,48 @@ char *generate_partition_syntax(THD *thd, partition_info *part_info, part_elem->part_state != PART_REORGED_DROPPED) { if (!first) - { - err+= add_comma(fptr); - err+= add_string(fptr, "\n"); - err+= add_space(fptr); - } + err+= str.append(STRING_WITH_LEN(",\n ")); first= FALSE; - err+= add_partition(fptr); - err+= add_name_string(fptr, part_elem->partition_name); - err+= add_partition_values(fptr, part_info, part_elem, + err+= str.append(STRING_WITH_LEN("PARTITION ")); + err+= append_identifier(thd, &str, part_elem->partition_name, + strlen(part_elem->partition_name)); + err+= add_partition_values(&str, part_info, part_elem, create_info, alter_info); if (!part_info->is_sub_partitioned() || part_info->use_default_subpartitions) { if (show_partition_options) - err+= add_partition_options(fptr, part_elem); + err+= add_partition_options(&str, part_elem); } else { - err+= add_string(fptr, "\n"); - err+= add_space(fptr); - err+= add_begin_parenthesis(fptr); + err+= str.append(STRING_WITH_LEN("\n (")); List_iterator sub_it(part_elem->subpartitions); j= 0; do { part_elem= sub_it++; - err+= add_subpartition(fptr); - err+= add_name_string(fptr, part_elem->partition_name); + err+= str.append(STRING_WITH_LEN("SUBPARTITION ")); + err+= append_identifier(thd, &str, part_elem->partition_name, + strlen(part_elem->partition_name)); if (show_partition_options) - err+= add_partition_options(fptr, part_elem); + err+= add_partition_options(&str, part_elem); if (j != (num_subparts-1)) - { - err+= add_comma(fptr); - err+= add_string(fptr, "\n"); - err+= add_space(fptr); - err+= add_space(fptr); - } + err+= str.append(STRING_WITH_LEN(",\n ")); else - err+= add_end_parenthesis(fptr); + err+= str.append(')'); } while (++j < num_subparts); } } if (i == (tot_num_parts-1)) - err+= add_end_parenthesis(fptr); + err+= str.append(')'); } while (++i < tot_num_parts); } + thd->variables.option_bits= save_options; if (err) - goto close_file; - buffer_length= mysql_file_seek(fptr, 0L, MY_SEEK_END, MYF(0)); - if (unlikely(buffer_length == MY_FILEPOS_ERROR)) - goto close_file; - if (unlikely(mysql_file_seek(fptr, 0L, MY_SEEK_SET, MYF(0)) - == MY_FILEPOS_ERROR)) - goto close_file; - *buf_length= (uint)buffer_length; - if (use_sql_alloc) - buf= (char*) thd->alloc(*buf_length + 1); - else - buf= (char*) my_malloc(*buf_length+1, MYF(MY_WME)); - if (!buf) - goto close_file; - - if (unlikely(mysql_file_read(fptr, (uchar*)buf, *buf_length, MYF(MY_FNABP)))) - { - if (!use_sql_alloc) - my_free(buf); - buf= NULL; - } - else - buf[*buf_length]= 0; - -close_file: - mysql_file_close(fptr, MYF(0)); - DBUG_RETURN(buf); + DBUG_RETURN(NULL); + *buf_length= str.length(); + DBUG_RETURN(thd->strmake(str.ptr(), str.length())); } diff --git a/sql/sql_partition.h b/sql/sql_partition.h index c2665a8366b..96136790046 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -267,11 +267,10 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, bool *partition_changed, bool *fast_alter_table); char *generate_partition_syntax(THD *thd, partition_info *part_info, - uint *buf_length, bool use_sql_alloc, + uint *buf_length, bool show_partition_options, HA_CREATE_INFO *create_info, - Alter_info *alter_info, - const char *current_comment_start); + Alter_info *alter_info); bool verify_data_with_partition(TABLE *table, TABLE *part_table, uint32 part_id); bool compare_partition_options(HA_CREATE_INFO *table_create_info, @@ -291,6 +290,4 @@ void create_subpartition_name(char *out, const char *in1, void set_key_field_ptr(KEY *key_info, const uchar *new_buf, const uchar *old_buf); -extern const LEX_STRING partition_keywords[]; - #endif /* SQL_PARTITION_INCLUDED */ diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 1bc2321c1ca..d0d253cd911 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2225,19 +2225,14 @@ int show_create_table(THD *thd, TABLE_LIST *table_list, String *packet, */ uint part_syntax_len; char *part_syntax; - String comment_start; - comment_start.append(STRING_WITH_LEN("\n")); if ((part_syntax= generate_partition_syntax(thd, table->part_info, &part_syntax_len, - FALSE, show_table_options, - NULL, NULL, - comment_start.c_ptr()))) + NULL, NULL))) { - packet->append(comment_start); + packet->append('\n'); if (packet->append(part_syntax, part_syntax_len)) error= 1; - my_free(part_syntax); } } } @@ -6822,7 +6817,7 @@ get_partition_column_description(THD *thd, { part_column_list_val *col_val= &list_value->col_val_array[i]; if (col_val->max_value) - tmp_str.append(partition_keywords[PKW_MAXVALUE].str); + tmp_str.append(STRING_WITH_LEN("MAXVALUE")); else if (col_val->null_value) tmp_str.append("NULL"); else @@ -6899,27 +6894,21 @@ static int get_schema_partitions_record(THD *thd, TABLE_LIST *tables, case LIST_PARTITION: tmp_res.length(0); if (part_info->part_type == RANGE_PARTITION) - tmp_res.append(partition_keywords[PKW_RANGE].str, - partition_keywords[PKW_RANGE].length); + tmp_res.append(STRING_WITH_LEN("RANGE")); else - tmp_res.append(partition_keywords[PKW_LIST].str, - partition_keywords[PKW_LIST].length); + tmp_res.append(STRING_WITH_LEN("LIST")); if (part_info->column_list) - tmp_res.append(partition_keywords[PKW_COLUMNS].str, - partition_keywords[PKW_COLUMNS].length); + tmp_res.append(STRING_WITH_LEN(" COLUMNS")); table->field[7]->store(tmp_res.ptr(), tmp_res.length(), cs); break; case HASH_PARTITION: tmp_res.length(0); if (part_info->linear_hash_ind) - tmp_res.append(partition_keywords[PKW_LINEAR].str, - partition_keywords[PKW_LINEAR].length); + tmp_res.append(STRING_WITH_LEN("LINEAR ")); if (part_info->list_of_part_fields) - tmp_res.append(partition_keywords[PKW_KEY].str, - partition_keywords[PKW_KEY].length); + tmp_res.append(STRING_WITH_LEN("KEY")); else - tmp_res.append(partition_keywords[PKW_HASH].str, - partition_keywords[PKW_HASH].length); + tmp_res.append(STRING_WITH_LEN("HASH")); table->field[7]->store(tmp_res.ptr(), tmp_res.length(), cs); break; default: @@ -6947,14 +6936,11 @@ static int get_schema_partitions_record(THD *thd, TABLE_LIST *tables, /* Subpartition method */ tmp_res.length(0); if (part_info->linear_hash_ind) - tmp_res.append(partition_keywords[PKW_LINEAR].str, - partition_keywords[PKW_LINEAR].length); + tmp_res.append(STRING_WITH_LEN("LINEAR ")); if (part_info->list_of_subpart_fields) - tmp_res.append(partition_keywords[PKW_KEY].str, - partition_keywords[PKW_KEY].length); + tmp_res.append(STRING_WITH_LEN("KEY")); else - tmp_res.append(partition_keywords[PKW_HASH].str, - partition_keywords[PKW_HASH].length); + tmp_res.append(STRING_WITH_LEN("HASH")); table->field[8]->store(tmp_res.ptr(), tmp_res.length(), cs); table->field[8]->set_notnull(); @@ -7003,8 +6989,7 @@ static int get_schema_partitions_record(THD *thd, TABLE_LIST *tables, if (part_elem->range_value != LONGLONG_MAX) table->field[11]->store((longlong) part_elem->range_value, FALSE); else - table->field[11]->store(partition_keywords[PKW_MAXVALUE].str, - partition_keywords[PKW_MAXVALUE].length, cs); + table->field[11]->store(STRING_WITH_LEN("MAXVALUE"), cs); } table->field[11]->set_notnull(); } diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 62473e082c3..c16b2ef9844 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -480,6 +480,14 @@ bool String::append(const char *s) return append(s, (uint) strlen(s)); } +bool String::append_longlong(longlong val) +{ + if (realloc(str_length+MAX_BIGINT_WIDTH+2)) + return TRUE; + char *end= (char*) longlong10_to_str(val, (char*) Ptr + str_length, -10); + str_length= end - Ptr; + return FALSE; +} bool String::append_ulonglong(ulonglong val) diff --git a/sql/sql_string.h b/sql/sql_string.h index 18f5f4cac5c..9a9fff8522c 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -471,6 +471,7 @@ public: bool append(const char *s, uint32 arg_length); bool append(const char *s, uint32 arg_length, CHARSET_INFO *cs); bool append_ulonglong(ulonglong val); + bool append_longlong(longlong val); bool append(IO_CACHE* file, uint32 arg_length); bool append_with_prefill(const char *s, uint32 arg_length, uint32 full_length, char fill_char); diff --git a/sql/sql_table.cc b/sql/sql_table.cc index db708ff613c..222b3182114 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1820,11 +1820,9 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags) if (part_info) { if (!(part_syntax_buf= generate_partition_syntax(lpt->thd, part_info, - &syntax_len, - TRUE, TRUE, + &syntax_len, TRUE, lpt->create_info, - lpt->alter_info, - NULL))) + lpt->alter_info))) { DBUG_RETURN(TRUE); } @@ -1903,11 +1901,9 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags) TABLE_SHARE *share= lpt->table->s; char *tmp_part_syntax_str; if (!(part_syntax_buf= generate_partition_syntax(lpt->thd, part_info, - &syntax_len, - TRUE, TRUE, + &syntax_len, TRUE, lpt->create_info, - lpt->alter_info, - NULL))) + lpt->alter_info))) { error= 1; goto err; @@ -4548,11 +4544,9 @@ handler *mysql_create_frm_image(THD *thd, for syntax stored in frm file. */ if (!(part_syntax_buf= generate_partition_syntax(thd, part_info, - &syntax_len, - TRUE, TRUE, + &syntax_len, TRUE, create_info, - alter_info, - NULL))) + alter_info))) goto err; part_info->part_info_string= part_syntax_buf; part_info->part_info_len= syntax_len; diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index 56931f47f24..e980a42eef0 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -8573,7 +8573,7 @@ int spider_discover_table_structure( } #ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE_COMMENT if (!(part_syntax = generate_partition_syntax(thd, part_info, &part_syntax_len, - FALSE, TRUE, info, NULL, NULL))) + TRUE, info, NULL))) #else if (!(part_syntax = generate_partition_syntax(part_info, &part_syntax_len, FALSE, TRUE, info, NULL))) @@ -8586,7 +8586,6 @@ int spider_discover_table_structure( DBUG_RETURN(HA_ERR_OUT_OF_MEM); } str.q_append(part_syntax, part_syntax_len); - my_free(part_syntax, MYF(0)); } #endif DBUG_PRINT("info",("spider str=%s", str.c_ptr_safe())); From 785e2248bd12b2b8fc417776c4b24fb62daab35d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 27 Jun 2017 20:46:45 +0200 Subject: [PATCH 076/102] MDEV-13089 identifier quoting in partitioning don't print partitioning expression as it was entered by the user, use Item::print() according to the sql_mode and sql_quote_show_create --- mysql-test/r/ctype_uca_partitions.result | 2 +- mysql-test/r/information_schema_part.result | 58 +- mysql-test/r/partition.result | 208 +- mysql-test/r/partition_alter.result | 12 +- mysql-test/r/partition_cache_innodb.result | 18 +- mysql-test/r/partition_cache_myisam.result | 18 +- mysql-test/r/partition_column.result | 82 +- mysql-test/r/partition_datatype.result | 24 +- mysql-test/r/partition_default.result | 156 +- mysql-test/r/partition_error.result | 64 +- mysql-test/r/partition_example.result | 12 +- mysql-test/r/partition_exchange.result | 132 +- mysql-test/r/partition_explicit_prune.result | 102 +- mysql-test/r/partition_innodb.result | 14 +- mysql-test/r/partition_innodb_plugin.result | 10 +- mysql-test/r/partition_list.result | 16 +- mysql-test/r/partition_mgm.result | 12 +- mysql-test/r/partition_mgm_err.result | 2 +- mysql-test/r/partition_myisam.result | 10 +- mysql-test/r/partition_not_windows.result | 4 +- mysql-test/r/partition_range.result | 92 +- mysql-test/r/partition_symlink.result | 12 +- mysql-test/r/partition_utf8.result | 14 +- mysql-test/r/type_datetime_hires.result | 12 +- .../suite/archive/partition_archive.result | 32 +- .../encryption/r/encryption_force.result | 2 +- .../federated/federated_partition.result | 6 +- .../suite/gcol/r/innodb_virtual_basic.result | 2 +- mysql-test/suite/innodb_zip/r/restart.result | 192 +- .../r/part_supported_sql_func_innodb.result | 256 +- .../r/part_supported_sql_func_myisam.result | 256 +- .../r/partition_alter1_1_2_innodb.result | 798 ++--- .../r/partition_alter1_1_2_myisam.result | 228 +- .../parts/r/partition_alter1_1_innodb.result | 456 +-- .../parts/r/partition_alter1_1_myisam.result | 228 +- .../parts/r/partition_alter1_2_innodb.result | 1140 +++---- .../parts/r/partition_alter1_2_myisam.result | 456 +-- .../r/partition_alter2_1_1_innodb.result | 570 ++-- .../r/partition_alter2_1_2_innodb.result | 570 ++-- .../parts/r/partition_alter2_1_maria.result | 684 ++-- .../parts/r/partition_alter2_1_myisam.result | 684 ++-- .../r/partition_alter2_2_1_innodb.result | 570 ++-- .../r/partition_alter2_2_2_innodb.result | 570 ++-- .../parts/r/partition_alter2_2_maria.result | 684 ++-- .../parts/r/partition_alter2_2_myisam.result | 684 ++-- .../parts/r/partition_alter3_innodb.result | 220 +- .../parts/r/partition_alter3_myisam.result | 220 +- .../parts/r/partition_alter4_innodb.result | 2944 ++++++++--------- .../parts/r/partition_alter4_myisam.result | 2944 ++++++++--------- .../r/partition_auto_increment_archive.result | 38 +- .../partition_auto_increment_blackhole.result | 38 +- .../r/partition_auto_increment_innodb.result | 38 +- .../r/partition_auto_increment_maria.result | 38 +- .../r/partition_auto_increment_memory.result | 38 +- .../r/partition_auto_increment_myisam.result | 38 +- .../parts/r/partition_basic_innodb.result | 912 ++--- .../parts/r/partition_basic_myisam.result | 456 +-- .../r/partition_basic_symlink_innodb.result | 18 +- .../r/partition_basic_symlink_myisam.result | 630 ++-- .../parts/r/partition_bigint_innodb.result | 14 +- .../parts/r/partition_bigint_myisam.result | 14 +- .../suite/parts/r/partition_bit_innodb.result | 48 +- .../suite/parts/r/partition_bit_myisam.result | 48 +- .../parts/r/partition_char_innodb.result | Bin 50146 -> 50218 bytes .../parts/r/partition_char_myisam.result | Bin 50146 -> 50218 bytes .../parts/r/partition_datetime_innodb.result | 132 +- .../parts/r/partition_datetime_myisam.result | 132 +- .../suite/parts/r/partition_debug.result | 216 +- .../parts/r/partition_debug_innodb.result | 1350 ++++---- .../parts/r/partition_debug_myisam.result | 1134 +++---- .../r/partition_debug_sync_innodb.result | 10 +- .../parts/r/partition_decimal_innodb.result | 40 +- .../parts/r/partition_decimal_myisam.result | 40 +- .../parts/r/partition_double_innodb.result | 12 +- .../parts/r/partition_double_myisam.result | 12 +- .../parts/r/partition_engine_innodb.result | 124 +- .../parts/r/partition_engine_myisam.result | 124 +- .../parts/r/partition_exch_qa_1_innodb.result | 16 +- .../parts/r/partition_exch_qa_1_myisam.result | 16 +- .../parts/r/partition_exchange_innodb.result | 28 +- .../parts/r/partition_exchange_memory.result | 28 +- .../parts/r/partition_exchange_myisam.result | 28 +- .../parts/r/partition_float_innodb.result | 12 +- .../parts/r/partition_float_myisam.result | 12 +- .../suite/parts/r/partition_int_innodb.result | 14 +- .../suite/parts/r/partition_int_myisam.result | 14 +- .../parts/r/partition_mediumint_innodb.result | 14 +- .../parts/r/partition_mediumint_myisam.result | 14 +- .../parts/r/partition_mgm_lc0_innodb.result | 206 +- .../parts/r/partition_mgm_lc0_memory.result | 206 +- .../parts/r/partition_mgm_lc0_myisam.result | 206 +- .../parts/r/partition_mgm_lc1_innodb.result | 204 +- .../parts/r/partition_mgm_lc1_memory.result | 204 +- .../parts/r/partition_mgm_lc1_myisam.result | 204 +- .../parts/r/partition_smallint_innodb.result | 14 +- .../parts/r/partition_smallint_myisam.result | 14 +- .../parts/r/partition_special_innodb.result | 40 +- .../parts/r/partition_special_myisam.result | 40 +- .../parts/r/partition_syntax_innodb.result | 86 +- .../parts/r/partition_syntax_myisam.result | 86 +- .../parts/r/partition_tinyint_innodb.result | 14 +- .../parts/r/partition_tinyint_myisam.result | 14 +- mysql-test/suite/parts/r/quoting.result | 63 + mysql-test/suite/parts/r/rpl_partition.result | 26 +- mysql-test/suite/parts/t/quoting.test | 19 + .../suite/perfschema/r/part_table_io.result | 2 +- .../rpl/r/rpl_extra_col_slave_innodb.result | 4 +- .../rpl/r/rpl_extra_col_slave_myisam.result | 4 +- .../suite/rpl/r/rpl_innodb_bug28430.result | 26 +- .../suite/rpl/r/rpl_partition_innodb.result | 12 +- .../suite/rpl/r/rpl_partition_memory.result | 12 +- .../suite/rpl/r/rpl_partition_myisam.result | 12 +- .../rpl/r/rpl_row_basic_8partition.result | 96 +- sql/item.h | 1 + sql/sql_partition.cc | 10 +- sql/sql_show.cc | 10 +- .../rocksdb/r/add_index_inplace.result | 2 +- .../rocksdb/r/add_index_inplace_crash.result | 6 +- .../rpl/r/rpl_extra_col_slave_tokudb.result | 4 +- .../rpl/r/rpl_partition_tokudb.result | 12 +- .../rpl/r/rpl_tokudb_bug28430.result | 26 +- .../tokudb_alter_table/r/ai_part.result | 4 +- .../tokudb_alter_table/r/hcad_part.result | 4 +- .../r/partition_alter3_tokudb.result | 220 +- .../r/partition_auto_increment_tokudb.result | 38 +- .../r/partition_bit_tokudb.result | 48 +- .../r/partition_char_tokudb.result | Bin 50146 -> 50218 bytes .../r/partition_datetime_tokudb.result | 132 +- .../r/partition_debug_sync_tokudb.result | 10 +- .../r/partition_decimal_tokudb.result | 40 +- .../r/partition_engine_tokudb.result | 124 +- .../r/partition_exch_qa_1_tokudb.result | 16 +- .../r/partition_exchange_tokudb.result | 28 +- .../r/partition_float_tokudb.result | 24 +- .../r/partition_int_tokudb.result | 70 +- .../r/partition_mgm_lc0_tokudb.result | 206 +- .../r/partition_mgm_lc10_tokudb.result | 190 +- .../r/partition_mgm_lc1_tokudb.result | 204 +- .../r/partition_special_tokudb.result | 40 +- .../r/partition_syntax_tokudb.result | 86 +- 140 files changed, 12910 insertions(+), 12831 deletions(-) create mode 100644 mysql-test/suite/parts/r/quoting.result create mode 100644 mysql-test/suite/parts/t/quoting.test diff --git a/mysql-test/r/ctype_uca_partitions.result b/mysql-test/r/ctype_uca_partitions.result index 508893522e4..154de148ee0 100644 --- a/mysql-test/r/ctype_uca_partitions.result +++ b/mysql-test/r/ctype_uca_partitions.result @@ -6,7 +6,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_thai_520_w2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 3 INSERT INTO t1 VALUES ('A'),('À'),('Á'),('Â'),('Ã'),('Ä'),('Å'); INSERT INTO t1 VALUES ('B'); diff --git a/mysql-test/r/information_schema_part.result b/mysql-test/r/information_schema_part.result index 91720d12ac4..081631a512f 100644 --- a/mysql-test/r/information_schema_part.result +++ b/mysql-test/r/information_schema_part.result @@ -7,9 +7,9 @@ partition x3 values in (16, 8, 5+19, 70-43) tablespace ts3); select * from information_schema.partitions where table_schema="test" and table_name="t1"; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME -def test t1 x1 NULL 1 NULL LIST NULL b*a NULL 1 0 0 0 # 1024 0 # # NULL NULL default ts1 -def test t1 x2 NULL 2 NULL LIST NULL b*a NULL 3,11,5,7 0 0 0 # 1024 0 # # NULL NULL default ts2 -def test t1 x3 NULL 3 NULL LIST NULL b*a NULL 16,8,24,27 0 0 0 # 1024 0 # # NULL NULL default ts3 +def test t1 x1 NULL 1 NULL LIST NULL `b` * `a` NULL 1 0 0 0 # 1024 0 # # NULL NULL default ts1 +def test t1 x2 NULL 2 NULL LIST NULL `b` * `a` NULL 3,11,5,7 0 0 0 # 1024 0 # # NULL NULL default ts2 +def test t1 x3 NULL 3 NULL LIST NULL `b` * `a` NULL 16,8,24,27 0 0 0 # 1024 0 # # NULL NULL default ts3 create table t2 (a int not null,b int not null,c int not null, primary key(a,b)) partition by range (a) partitions 3 @@ -19,18 +19,18 @@ partition x3 values less than maxvalue tablespace ts3); select * from information_schema.partitions where table_schema="test" and table_name="t2"; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME -def test t2 x1 NULL 1 NULL RANGE NULL a NULL 5 0 0 0 # 1024 0 # # NULL NULL default ts1 -def test t2 x2 NULL 2 NULL RANGE NULL a NULL 10 0 0 0 # 1024 0 # # NULL NULL default ts2 -def test t2 x3 NULL 3 NULL RANGE NULL a NULL MAXVALUE 0 0 0 # 1024 0 # # NULL NULL default ts3 +def test t2 x1 NULL 1 NULL RANGE NULL `a` NULL 5 0 0 0 # 1024 0 # # NULL NULL default ts1 +def test t2 x2 NULL 2 NULL RANGE NULL `a` NULL 10 0 0 0 # 1024 0 # # NULL NULL default ts2 +def test t2 x3 NULL 3 NULL RANGE NULL `a` NULL MAXVALUE 0 0 0 # 1024 0 # # NULL NULL default ts3 create table t3 (f1 date) partition by hash(month(f1)) partitions 3; select * from information_schema.partitions where table_schema="test" and table_name="t3"; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME -def test t3 p0 NULL 1 NULL HASH NULL month(f1) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL -def test t3 p1 NULL 2 NULL HASH NULL month(f1) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL -def test t3 p2 NULL 3 NULL HASH NULL month(f1) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL +def test t3 p0 NULL 1 NULL HASH NULL month(`f1`) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL +def test t3 p1 NULL 2 NULL HASH NULL month(`f1`) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL +def test t3 p2 NULL 3 NULL HASH NULL month(`f1`) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL create table t4 (f1 date, f2 int) partition by key(f1,f2) partitions 3; @@ -63,14 +63,14 @@ subpartition x22 tablespace t2) ); select * from information_schema.partitions where table_schema="test"; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME -def test t1 x1 x11 1 1 RANGE HASH a a+b 1 0 0 0 # 1024 0 # # NULL NULL default t1 -def test t1 x1 x12 1 2 RANGE HASH a a+b 1 0 0 0 # 1024 0 # # NULL NULL default t2 -def test t1 x2 x21 2 1 RANGE HASH a a+b 5 0 0 0 # 1024 0 # # NULL NULL default t1 -def test t1 x2 x22 2 2 RANGE HASH a a+b 5 0 0 0 # 1024 0 # # NULL NULL default t2 -def test t2 x1 x11 1 1 RANGE KEY a `a` 1 0 0 0 # 1024 0 # # NULL NULL default t1 -def test t2 x1 x12 1 2 RANGE KEY a `a` 1 0 0 0 # 1024 0 # # NULL NULL default t2 -def test t2 x2 x21 2 1 RANGE KEY a `a` 5 0 0 0 # 1024 0 # # NULL NULL default t1 -def test t2 x2 x22 2 2 RANGE KEY a `a` 5 0 0 0 # 1024 0 # # NULL NULL default t2 +def test t1 x1 x11 1 1 RANGE HASH `a` `a` + `b` 1 0 0 0 # 1024 0 # # NULL NULL default t1 +def test t1 x1 x12 1 2 RANGE HASH `a` `a` + `b` 1 0 0 0 # 1024 0 # # NULL NULL default t2 +def test t1 x2 x21 2 1 RANGE HASH `a` `a` + `b` 5 0 0 0 # 1024 0 # # NULL NULL default t1 +def test t1 x2 x22 2 2 RANGE HASH `a` `a` + `b` 5 0 0 0 # 1024 0 # # NULL NULL default t2 +def test t2 x1 x11 1 1 RANGE KEY `a` `a` 1 0 0 0 # 1024 0 # # NULL NULL default t1 +def test t2 x1 x12 1 2 RANGE KEY `a` `a` 1 0 0 0 # 1024 0 # # NULL NULL default t2 +def test t2 x2 x21 2 1 RANGE KEY `a` `a` 5 0 0 0 # 1024 0 # # NULL NULL default t1 +def test t2 x2 x22 2 2 RANGE KEY `a` `a` 5 0 0 0 # 1024 0 # # NULL NULL default t2 drop table t1,t2; create table t1 ( a int not null, @@ -88,10 +88,10 @@ subpartition x22 tablespace t2 nodegroup 1) ); select * from information_schema.partitions where table_schema="test"; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME -def test t1 x1 x11 1 1 RANGE HASH a a+b 1 0 0 0 # 1024 0 # # NULL NULL 0 t1 -def test t1 x1 x12 1 2 RANGE HASH a a+b 1 0 0 0 # 1024 0 # # NULL NULL 1 t2 -def test t1 x2 x21 2 1 RANGE HASH a a+b 5 0 0 0 # 1024 0 # # NULL NULL 0 t1 -def test t1 x2 x22 2 2 RANGE HASH a a+b 5 0 0 0 # 1024 0 # # NULL NULL 1 t2 +def test t1 x1 x11 1 1 RANGE HASH `a` `a` + `b` 1 0 0 0 # 1024 0 # # NULL NULL 0 t1 +def test t1 x1 x12 1 2 RANGE HASH `a` `a` + `b` 1 0 0 0 # 1024 0 # # NULL NULL 1 t2 +def test t1 x2 x21 2 1 RANGE HASH `a` `a` + `b` 5 0 0 0 # 1024 0 # # NULL NULL 0 t1 +def test t1 x2 x22 2 2 RANGE HASH `a` `a` + `b` 5 0 0 0 # 1024 0 # # NULL NULL 1 t2 show tables; Tables_in_test t1 @@ -107,9 +107,9 @@ partitions 3; select * from information_schema.partitions where table_schema="test" and table_name="t1"; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME -def test t1 p0 NULL 1 NULL LINEAR HASH NULL month(f1) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL -def test t1 p1 NULL 2 NULL LINEAR HASH NULL month(f1) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL -def test t1 p2 NULL 3 NULL LINEAR HASH NULL month(f1) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL +def test t1 p0 NULL 1 NULL LINEAR HASH NULL month(`f1`) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL +def test t1 p1 NULL 2 NULL LINEAR HASH NULL month(`f1`) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL +def test t1 p2 NULL 3 NULL LINEAR HASH NULL month(`f1`) NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL drop table t1; create table t1 (a int) PARTITION BY RANGE (a) @@ -120,9 +120,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY LINEAR HASH (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +SUBPARTITION BY LINEAR HASH (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM) select SUBPARTITION_METHOD FROM information_schema.partitions WHERE table_schema="test" AND table_name="t1"; SUBPARTITION_METHOD @@ -138,8 +138,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53) ENGINE = MyISAM) SELECT PARTITION_DESCRIPTION FROM information_schema.partitions WHERE table_schema = "test" AND table_name = "t1"; PARTITION_DESCRIPTION diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index a30c38ad55c..cc77218575d 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -94,7 +94,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` int(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 2 SELECT * FROM t1; a b @@ -172,12 +172,12 @@ PARTITION p11 VALUES LESS THAN(200), PARTITION p21 VALUES LESS THAN MAXVALUE); SELECT PARTITION_EXPRESSION, SUBPARTITION_EXPRESSION FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME='t1'; PARTITION_EXPRESSION SUBPARTITION_EXPRESSION -ID `ID`,`aaaa,aaaaa` -ID `ID`,`aaaa,aaaaa` -ID `ID`,`aaaa,aaaaa` -ID `ID`,`aaaa,aaaaa` -ID `ID`,`aaaa,aaaaa` -ID `ID`,`aaaa,aaaaa` +`ID` `ID`,`aaaa,aaaaa` +`ID` `ID`,`aaaa,aaaaa` +`ID` `ID`,`aaaa,aaaaa` +`ID` `ID`,`aaaa,aaaaa` +`ID` `ID`,`aaaa,aaaaa` +`ID` `ID`,`aaaa,aaaaa` show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -187,12 +187,12 @@ t1 CREATE TABLE `t1` ( `new_field0` varchar(50) DEFAULT NULL, PRIMARY KEY (`ID`,`aaaa,aaaaa`,`ddddddddd`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (ID) + PARTITION BY RANGE (`ID`) SUBPARTITION BY LINEAR KEY (`ID`,`aaaa,aaaaa`) SUBPARTITIONS 2 -(PARTITION p01 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p11 VALUES LESS THAN (200) ENGINE = MyISAM, - PARTITION p21 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +(PARTITION `p01` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p11` VALUES LESS THAN (200) ENGINE = MyISAM, + PARTITION `p21` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) drop table t1; CREATE TABLE t1 (a INT, b INT) PARTITION BY LIST (a) @@ -264,10 +264,10 @@ t1 CREATE TABLE `t1` ( `b` varchar(10) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (UNIX_TIMESTAMP(a)) -(PARTITION p1 VALUES LESS THAN (1199134800) ENGINE = MyISAM, - PARTITION p3 VALUES LESS THAN (1247688000) ENGINE = MyISAM, - PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (unix_timestamp(`a`)) +(PARTITION `p1` VALUES LESS THAN (1199134800) ENGINE = MyISAM, + PARTITION `p3` VALUES LESS THAN (1247688000) ENGINE = MyISAM, + PARTITION `pmax` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) DROP TABLE t1; create table t1 (a int NOT NULL, b varchar(5) NOT NULL) default charset=utf8 @@ -376,9 +376,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) + PARTITION BY HASH (`a`) +(PARTITION `p0` ENGINE = MEMORY, + PARTITION `p1` ENGINE = MEMORY) DROP TABLE t1; SET sql_mode=DEFAULT; CREATE TABLE t1 (a INT NOT NULL, KEY(a)) @@ -775,20 +775,20 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY KEY (a) -(PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (2) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +SUBPARTITION BY KEY (`a`) +(PARTITION `p0` VALUES LESS THAN (1) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (2) ENGINE = MyISAM) alter table t1 reorganize partition p1 into (partition p1 values less than (3)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY KEY (a) -(PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (3) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +SUBPARTITION BY KEY (`a`) +(PARTITION `p0` VALUES LESS THAN (1) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (3) ENGINE = MyISAM) drop table t1; CREATE TABLE t1 ( a int not null, @@ -807,7 +807,7 @@ t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, PRIMARY KEY (`a`,`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) drop table t1; CREATE TABLE t1 ( a int not null, @@ -985,8 +985,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION x1 VALUES IN (1) ENGINE = MEMORY) + PARTITION BY LIST (`a`) +(PARTITION `x1` VALUES IN (1) ENGINE = MEMORY) drop table t1; CREATE TABLE t1 (a int, unique(a)) PARTITION BY LIST (a) @@ -1011,7 +1011,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 5 drop table t1; CREATE TABLE t1 (a int) @@ -1040,10 +1040,10 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (30) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = MyISAM) drop table t1; CREATE TABLE t1 (a int, b int) PARTITION BY RANGE (a) @@ -1065,15 +1065,15 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION x1 VALUES LESS THAN (6) ENGINE = MyISAM, - PARTITION x3 VALUES LESS THAN (8) ENGINE = MyISAM, - PARTITION x4 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION x5 VALUES LESS THAN (12) ENGINE = MyISAM, - PARTITION x6 VALUES LESS THAN (14) ENGINE = MyISAM, - PARTITION x7 VALUES LESS THAN (16) ENGINE = MyISAM, - PARTITION x8 VALUES LESS THAN (18) ENGINE = MyISAM, - PARTITION x9 VALUES LESS THAN (20) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `x1` VALUES LESS THAN (6) ENGINE = MyISAM, + PARTITION `x3` VALUES LESS THAN (8) ENGINE = MyISAM, + PARTITION `x4` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `x5` VALUES LESS THAN (12) ENGINE = MyISAM, + PARTITION `x6` VALUES LESS THAN (14) ENGINE = MyISAM, + PARTITION `x7` VALUES LESS THAN (16) ENGINE = MyISAM, + PARTITION `x8` VALUES LESS THAN (18) ENGINE = MyISAM, + PARTITION `x9` VALUES LESS THAN (20) ENGINE = MyISAM) drop table t1; create table t1 (a int not null, b int not null) partition by LIST (a+b) ( partition p0 values in (12), @@ -1128,36 +1128,36 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `p1` ENGINE = MyISAM) alter table t1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `p1` ENGINE = MyISAM) alter table t1 engine=myisam; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `p1` ENGINE = MyISAM) alter table t1 engine=heap; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MEMORY, + PARTITION `p1` ENGINE = MEMORY) alter table t1 remove partitioning; show create table t1; Table Create Table @@ -1175,9 +1175,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `p1` ENGINE = MyISAM) alter table t1 add column b int remove partitioning; show create table t1; Table Create Table @@ -1195,9 +1195,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `p1` ENGINE = MyISAM) alter table t1 engine=heap partition by key(a) @@ -1208,9 +1208,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MEMORY, + PARTITION `p1` ENGINE = MEMORY) alter table t1 engine=myisam, add column c int remove partitioning; show create table t1; Table Create Table @@ -1230,9 +1230,9 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MEMORY, + PARTITION `p1` ENGINE = MEMORY) alter table t1 partition by key (a) (partition p0, partition p1); @@ -1243,9 +1243,9 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MEMORY, + PARTITION `p1` ENGINE = MEMORY) alter table t1 engine=heap partition by key (a) @@ -1257,9 +1257,9 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MEMORY, + PARTITION `p1` ENGINE = MEMORY) alter table t1 partition by key(a) (partition p0, partition p1 engine=heap); @@ -1403,9 +1403,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM) alter table t1 add partition (partition p1 values less than (200) (subpartition subpart21)); show create table t1; @@ -1413,12 +1413,12 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a) -(PARTITION p0 VALUES LESS THAN (100) - (SUBPARTITION p0sp0 ENGINE = MyISAM), - PARTITION p1 VALUES LESS THAN (200) - (SUBPARTITION subpart21 ENGINE = MyISAM)) + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `p0` VALUES LESS THAN (100) + (SUBPARTITION `p0sp0` ENGINE = MyISAM), + PARTITION `p1` VALUES LESS THAN (200) + (SUBPARTITION `subpart21` ENGINE = MyISAM)) drop table t1; create table t1 (a int) partition by key (a); @@ -1427,16 +1427,16 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) alter table t1 add partition (partition p1); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `p1` ENGINE = MyISAM) drop table t1; create table t1 (a int, b int) partition by range (a) @@ -1520,9 +1520,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p1 VALUES IN (1) ENGINE = MyISAM, - PARTITION p2 VALUES IN (2) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (2) ENGINE = MyISAM) drop table t1; create table t1 (a int unsigned not null auto_increment primary key) partition by key(a); @@ -1534,7 +1534,7 @@ t2 CREATE TABLE `t2` ( `c` char(10) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='no comment' - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) drop table t2; create table t1 (f1 int) partition by hash (f1) as select 1; drop table t1; @@ -1731,8 +1731,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (NULL) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (NULL) ENGINE = MyISAM) DROP TABLE t1; CREATE TABLE t1 (a int) PARTITION BY RANGE(a) @@ -1769,8 +1769,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) - PARTITION BY KEY (a) -(PARTITION p0) + PARTITION BY KEY (`a`) +(PARTITION `p0`) set session sql_mode=''; drop table t1; create table t1 (a int) @@ -1785,7 +1785,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) drop table t1; CREATE TABLE t1 (a int) ENGINE = MYISAM PARTITION BY KEY(a); INSERT into t1 values (1), (2); @@ -1858,7 +1858,7 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 10 insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612); @@ -2024,9 +2024,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (b) -(PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (20) ENGINE = MyISAM) + PARTITION BY RANGE (`b`) +(PARTITION `p1` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN (20) ENGINE = MyISAM) drop table t1, t2; create table t1 (s1 timestamp on update current_timestamp, s2 int) @@ -2164,12 +2164,12 @@ t1 CREATE TABLE `t1` ( `user` char(25) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -SUBPARTITION BY HASH (id) + PARTITION BY RANGE (`id`) +SUBPARTITION BY HASH (`id`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION pa2 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +(PARTITION `pa1` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `pa2` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `pa11` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) drop table t1; CREATE TABLE t1 ( `ID` bigint(20) NOT NULL AUTO_INCREMENT, diff --git a/mysql-test/r/partition_alter.result b/mysql-test/r/partition_alter.result index bc2c2f17c97..df3ed14e10a 100644 --- a/mysql-test/r/partition_alter.result +++ b/mysql-test/r/partition_alter.result @@ -70,9 +70,9 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`id`,`d`), CONSTRAINT `CONSTRAINT_1` CHECK (`b` in (0,10)) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE COLUMNS(d) -(PARTITION p1 VALUES LESS THAN ('2016-10-18') ENGINE = InnoDB, - PARTITION p2 VALUES LESS THAN ('2020-10-19') ENGINE = InnoDB) + PARTITION BY RANGE COLUMNS(`d`) +(PARTITION `p1` VALUES LESS THAN ('2016-10-18') ENGINE = InnoDB, + PARTITION `p2` VALUES LESS THAN ('2020-10-19') ENGINE = InnoDB) insert t1 values (2, '2020-01-03', 20); ERROR 23000: CONSTRAINT `CONSTRAINT_1` failed for `test`.`t1` drop table t1; @@ -94,9 +94,9 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`id`,`d`), CONSTRAINT `CONSTRAINT_1` CHECK (`b` in (0,10)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE COLUMNS(d) -(PARTITION p1 VALUES LESS THAN ('2016-10-18') ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN ('2020-10-19') ENGINE = MyISAM) + PARTITION BY RANGE COLUMNS(`d`) +(PARTITION `p1` VALUES LESS THAN ('2016-10-18') ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN ('2020-10-19') ENGINE = MyISAM) insert t1 values (2, '2020-01-03', 20); ERROR 23000: CONSTRAINT `CONSTRAINT_1` failed for `test`.`t1` drop table t1; diff --git a/mysql-test/r/partition_cache_innodb.result b/mysql-test/r/partition_cache_innodb.result index f0e4f83ddb3..e6e69ee686e 100644 --- a/mysql-test/r/partition_cache_innodb.result +++ b/mysql-test/r/partition_cache_innodb.result @@ -23,10 +23,10 @@ t1 CREATE TABLE `t1` ( `created_at` datetime NOT NULL, `cool` tinyint(4) DEFAULT 0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (TO_DAYS(created_at)) -(PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = InnoDB, - PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = InnoDB, - PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (to_days(`created_at`)) +(PARTITION `month_2010_4` VALUES LESS THAN (734258) ENGINE = InnoDB, + PARTITION `month_2010_5` VALUES LESS THAN (734289) ENGINE = InnoDB, + PARTITION `month_max` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) INSERT INTO t1 VALUES (1, now(), 0); flush status; show status like "Qcache_queries_in_cache"; @@ -72,12 +72,12 @@ t1 CREATE TABLE `t1` ( `created_at` datetime NOT NULL, `cool` tinyint(4) DEFAULT 0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (TO_DAYS(created_at)) -SUBPARTITION BY HASH (cool) + PARTITION BY RANGE (to_days(`created_at`)) +SUBPARTITION BY HASH (`cool`) SUBPARTITIONS 3 -(PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = InnoDB, - PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = InnoDB, - PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = InnoDB) +(PARTITION `month_2010_4` VALUES LESS THAN (734258) ENGINE = InnoDB, + PARTITION `month_2010_5` VALUES LESS THAN (734289) ENGINE = InnoDB, + PARTITION `month_max` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) INSERT INTO t1 VALUES (1, now(), 0); flush status; show status like "Qcache_queries_in_cache"; diff --git a/mysql-test/r/partition_cache_myisam.result b/mysql-test/r/partition_cache_myisam.result index 2b6c34b1cd9..d8e4f837ff7 100644 --- a/mysql-test/r/partition_cache_myisam.result +++ b/mysql-test/r/partition_cache_myisam.result @@ -23,10 +23,10 @@ t1 CREATE TABLE `t1` ( `created_at` datetime NOT NULL, `cool` tinyint(4) DEFAULT 0 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (TO_DAYS(created_at)) -(PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = MyISAM, - PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = MyISAM, - PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (to_days(`created_at`)) +(PARTITION `month_2010_4` VALUES LESS THAN (734258) ENGINE = MyISAM, + PARTITION `month_2010_5` VALUES LESS THAN (734289) ENGINE = MyISAM, + PARTITION `month_max` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) INSERT INTO t1 VALUES (1, now(), 0); flush status; show status like "Qcache_queries_in_cache"; @@ -72,12 +72,12 @@ t1 CREATE TABLE `t1` ( `created_at` datetime NOT NULL, `cool` tinyint(4) DEFAULT 0 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (TO_DAYS(created_at)) -SUBPARTITION BY HASH (cool) + PARTITION BY RANGE (to_days(`created_at`)) +SUBPARTITION BY HASH (`cool`) SUBPARTITIONS 3 -(PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = MyISAM, - PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = MyISAM, - PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +(PARTITION `month_2010_4` VALUES LESS THAN (734258) ENGINE = MyISAM, + PARTITION `month_2010_5` VALUES LESS THAN (734289) ENGINE = MyISAM, + PARTITION `month_max` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) INSERT INTO t1 VALUES (1, now(), 0); flush status; show status like "Qcache_queries_in_cache"; diff --git a/mysql-test/r/partition_column.result b/mysql-test/r/partition_column.result index 3df31078a50..067245fc682 100644 --- a/mysql-test/r/partition_column.result +++ b/mysql-test/r/partition_column.result @@ -30,9 +30,9 @@ t1 CREATE TABLE `t1` ( `department` varchar(10) DEFAULT NULL, `country` varchar(255) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(department,country) -(PARTITION first_office VALUES IN (('dep1','Russia'),('dep1','Croatia')) ENGINE = MyISAM, - PARTITION second_office VALUES IN (('dep2','Russia')) ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`department`,`country`) +(PARTITION `first_office` VALUES IN (('dep1','Russia'),('dep1','Croatia')) ENGINE = MyISAM, + PARTITION `second_office` VALUES IN (('dep2','Russia')) ENGINE = MyISAM) SELECT * FROM t1 WHERE department = 'dep2' and country = 'Croatia'; id name department country SELECT * FROM t1 WHERE department = 'dep1' and country = 'Croatia'; @@ -173,10 +173,10 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(5) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a) -(PARTITION p0 VALUES IN ('''') ENGINE = MyISAM, - PARTITION p1 VALUES IN ('\\') ENGINE = MyISAM, - PARTITION p2 VALUES IN ('\0') ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`) +(PARTITION `p0` VALUES IN ('''') ENGINE = MyISAM, + PARTITION `p1` VALUES IN ('\\') ENGINE = MyISAM, + PARTITION `p2` VALUES IN ('\0') ENGINE = MyISAM) drop table t1; set @@sql_mode=allow_invalid_dates; create table t1 (a char, b char, c date) @@ -232,13 +232,13 @@ t1 CREATE TABLE `t1` ( `c` varchar(25) DEFAULT NULL, `d` datetime DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE COLUMNS(a,b,c,d) -SUBPARTITION BY HASH (to_seconds(d)) + PARTITION BY RANGE COLUMNS(`a`,`b`,`c`,`d`) +SUBPARTITION BY HASH (to_seconds(`d`)) SUBPARTITIONS 4 -(PARTITION p0 VALUES LESS THAN (1,'0',MAXVALUE,'1900-01-01') ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (1,'a',MAXVALUE,'1999-01-01') ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (1,'b',MAXVALUE,MAXVALUE) ENGINE = MyISAM, - PARTITION p3 VALUES LESS THAN (1,MAXVALUE,MAXVALUE,MAXVALUE) ENGINE = MyISAM) +(PARTITION `p0` VALUES LESS THAN (1,'0',MAXVALUE,'1900-01-01') ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (1,'a',MAXVALUE,'1999-01-01') ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN (1,'b',MAXVALUE,MAXVALUE) ENGINE = MyISAM, + PARTITION `p3` VALUES LESS THAN (1,MAXVALUE,MAXVALUE,MAXVALUE) ENGINE = MyISAM) drop table t1; create table t1 (a int, b int) partition by range columns (a,b) @@ -315,10 +315,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a,b) -(PARTITION p0 VALUES IN ((1,NULL),(2,NULL),(NULL,NULL)) ENGINE = MyISAM, - PARTITION p1 VALUES IN ((1,1),(2,2)) ENGINE = MyISAM, - PARTITION p2 VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`,`b`) +(PARTITION `p0` VALUES IN ((1,NULL),(2,NULL),(NULL,NULL)) ENGINE = MyISAM, + PARTITION `p1` VALUES IN ((1,1),(2,2)) ENGINE = MyISAM, + PARTITION `p2` VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM) insert into t1 values (3, NULL); insert into t1 values (NULL, 1); insert into t1 values (NULL, NULL); @@ -349,10 +349,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a,b) -(PARTITION p0 VALUES IN ((1,NULL),(2,NULL),(NULL,NULL)) ENGINE = MyISAM, - PARTITION p1 VALUES IN ((1,1),(2,2)) ENGINE = MyISAM, - PARTITION p2 VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`,`b`) +(PARTITION `p0` VALUES IN ((1,NULL),(2,NULL),(NULL,NULL)) ENGINE = MyISAM, + PARTITION `p1` VALUES IN ((1,1),(2,2)) ENGINE = MyISAM, + PARTITION `p2` VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM) drop table t1; create table t1 (a int) partition by list (a) @@ -366,16 +366,16 @@ partition p1 values in (4, NULL, 3)); select partition_method, partition_expression, partition_description from information_schema.partitions where table_name = "t1"; partition_method partition_expression partition_description -LIST a 2,1 -LIST a NULL,4,3 +LIST `a` 2,1 +LIST `a` NULL,4,3 show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (2,1) ENGINE = MyISAM, - PARTITION p1 VALUES IN (NULL,4,3) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (2,1) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (NULL,4,3) ENGINE = MyISAM) insert into t1 values (1); insert into t1 values (2); insert into t1 values (3); @@ -403,9 +403,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a) -(PARTITION p0 VALUES IN (2,1) ENGINE = MyISAM, - PARTITION p1 VALUES IN (4,NULL,3) ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`) +(PARTITION `p0` VALUES IN (2,1) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (4,NULL,3) ENGINE = MyISAM) insert into t1 values (1); insert into t1 values (2); insert into t1 values (3); @@ -418,9 +418,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a) -(PARTITION p0 VALUES IN (2,1) ENGINE = MyISAM, - PARTITION p1 VALUES IN (4,NULL,3) ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`) +(PARTITION `p0` VALUES IN (2,1) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (4,NULL,3) ENGINE = MyISAM) drop table t1; create table t1 (a int, b char(10), c varchar(5), d int) partition by range columns(a,b,c) @@ -453,13 +453,13 @@ t1 CREATE TABLE `t1` ( `c` varchar(5) DEFAULT NULL, `d` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE COLUMNS(a,b,c) -SUBPARTITION BY KEY (c,d) + PARTITION BY RANGE COLUMNS(`a`,`b`,`c`) +SUBPARTITION BY KEY (`c`,`d`) SUBPARTITIONS 3 -(PARTITION p0 VALUES LESS THAN (1,'abc','abc') ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (2,'abc','abc') ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (3,'abc','abc') ENGINE = MyISAM, - PARTITION p3 VALUES LESS THAN (4,'abc','abc') ENGINE = MyISAM) +(PARTITION `p0` VALUES LESS THAN (1,'abc','abc') ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (2,'abc','abc') ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN (3,'abc','abc') ENGINE = MyISAM, + PARTITION `p3` VALUES LESS THAN (4,'abc','abc') ENGINE = MyISAM) insert into t1 values (1,'a','b',1),(2,'a','b',2),(3,'a','b',3); insert into t1 values (1,'b','c',1),(2,'b','c',2),(3,'b','c',3); insert into t1 values (1,'c','d',1),(2,'c','d',2),(3,'c','d',3); @@ -486,9 +486,9 @@ t1 CREATE TABLE `t1` ( `b` varchar(2) DEFAULT NULL, `c` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE COLUMNS(a,b,c) -(PARTITION p0 VALUES LESS THAN (1,'A',1) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (1,'B',1) ENGINE = MyISAM) + PARTITION BY RANGE COLUMNS(`a`,`b`,`c`) +(PARTITION `p0` VALUES LESS THAN (1,'A',1) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (1,'B',1) ENGINE = MyISAM) insert into t1 values (1, 'A', 1); explain partitions select * from t1 where a = 1 AND b <= 'A' and c = 1; id select_type table partitions type possible_keys key key_len ref rows Extra diff --git a/mysql-test/r/partition_datatype.result b/mysql-test/r/partition_datatype.result index 5f7590b5a3a..f0921a2097c 100644 --- a/mysql-test/r/partition_datatype.result +++ b/mysql-test/r/partition_datatype.result @@ -329,10 +329,10 @@ t1 CREATE TABLE `t1` ( `a` bit(27) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM, - PARTITION p2 ENGINE = MyISAM) + PARTITION BY HASH (`a`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `p1` ENGINE = MyISAM, + PARTITION `p2` ENGINE = MyISAM) insert into t1 values (1),(4),(7),(10),(13),(16),(19),(22),(25),(28),(31),(34); select hex(a) from t1 where a = 7; hex(a) @@ -850,16 +850,16 @@ t2 CREATE TABLE `t2` ( `a` timestamp NULL DEFAULT NULL, `tz` varchar(16) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (UNIX_TIMESTAMP(a)) -(PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION BY RANGE (unix_timestamp(`a`)) +(PARTITION `p0` VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION `p-2000` VALUES LESS THAN (946684800) ENGINE = MyISAM, PARTITION `p-2011-MSK` VALUES LESS THAN (1301180400) ENGINE = MyISAM, PARTITION `p-2011-MSD-1` VALUES LESS THAN (1319925600) ENGINE = MyISAM, PARTITION `p-2011-MSD-2` VALUES LESS THAN (1319929200) ENGINE = MyISAM, PARTITION `p-2012-MSK-1` VALUES LESS THAN (1319932800) ENGINE = MyISAM, PARTITION `p-2012-MSK-2` VALUES LESS THAN (1332630000) ENGINE = MyISAM, - PARTITION pEnd VALUES LESS THAN (2147483647) ENGINE = MyISAM, - PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION `pEnd` VALUES LESS THAN (2147483647) ENGINE = MyISAM, + PARTITION `pMax` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) TRUNCATE TABLE t2; SET @@session.time_zone = 'Europe/Moscow'; INSERT INTO t2 SELECT * FROM t1; @@ -1334,16 +1334,16 @@ t2 CREATE TABLE `t2` ( `a` timestamp NULL DEFAULT NULL, `tz` varchar(16) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (UNIX_TIMESTAMP(a)) -(PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION BY RANGE (unix_timestamp(`a`)) +(PARTITION `p0` VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION `p-2000` VALUES LESS THAN (946684800) ENGINE = MyISAM, PARTITION `p-2011-MSK` VALUES LESS THAN (1301180400) ENGINE = MyISAM, PARTITION `p-2011-MSD-1` VALUES LESS THAN (1319925600) ENGINE = MyISAM, PARTITION `p-2011-MSD-2` VALUES LESS THAN (1319929200) ENGINE = MyISAM, PARTITION `p-2012-MSK-1` VALUES LESS THAN (1319932800) ENGINE = MyISAM, PARTITION `p-2012-MSK-2` VALUES LESS THAN (1332630000) ENGINE = MyISAM, - PARTITION pEnd VALUES LESS THAN (2147483647) ENGINE = MyISAM, - PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION `pEnd` VALUES LESS THAN (2147483647) ENGINE = MyISAM, + PARTITION `pMax` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) TRUNCATE TABLE t2; DROP TABLE t1, t2; SET @@session.time_zone= @old_time_zone; diff --git a/mysql-test/r/partition_default.result b/mysql-test/r/partition_default.result index bb0a5d4061b..db3b714bbcc 100644 --- a/mysql-test/r/partition_default.result +++ b/mysql-test/r/partition_default.result @@ -22,10 +22,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM, - PARTITION p1 VALUES IN (1) ENGINE = MyISAM, - PARTITION p0 DEFAULT ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p2` VALUES IN (4,5,6) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `p0` DEFAULT ENGINE = MyISAM) insert into t1 values (10,10); insert into t1 values (4,4); select * from t1; @@ -72,10 +72,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 DEFAULT ENGINE = MyISAM, - PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM, - PARTITION p1 VALUES IN (1) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` DEFAULT ENGINE = MyISAM, + PARTITION `p2` VALUES IN (4,5,6) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (1) ENGINE = MyISAM) insert into t1 values (10,10); select * from t1; a b @@ -100,10 +100,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 DEFAULT ENGINE = MyISAM, - PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM, - PARTITION p1 VALUES IN (1,0) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` DEFAULT ENGINE = MyISAM, + PARTITION `p2` VALUES IN (4,5,6) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (1,0) ENGINE = MyISAM) insert into t1 values (10,10); select * from t1; a b @@ -128,10 +128,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a,b) -(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM, - PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, - PARTITION p0 DEFAULT ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`,`b`) +(PARTITION `p2` VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM, + PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, + PARTITION `p0` DEFAULT ENGINE = MyISAM) insert into t1 values (10,10); select * from t1; a b @@ -176,10 +176,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM, - PARTITION p1 VALUES IN (1,20) ENGINE = MyISAM, - PARTITION p0 DEFAULT ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p2` VALUES IN (4,5,6) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (1,20) ENGINE = MyISAM, + PARTITION `p0` DEFAULT ENGINE = MyISAM) insert into t1 values (10,10); select partition_name, table_rows from INFORMATION_SCHEMA.PARTITIONS where table_name='t1'; partition_name table_rows @@ -256,10 +256,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a,b) -(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6),(5,5)) ENGINE = MyISAM, - PARTITION p1 VALUES IN ((1,1),(20,20)) ENGINE = MyISAM, - PARTITION p0 DEFAULT ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`,`b`) +(PARTITION `p2` VALUES IN ((1,4),(2,5),(3,6),(5,5)) ENGINE = MyISAM, + PARTITION `p1` VALUES IN ((1,1),(20,20)) ENGINE = MyISAM, + PARTITION `p0` DEFAULT ENGINE = MyISAM) insert into t1 values (10,10); select partition_name, table_rows from INFORMATION_SCHEMA.PARTITIONS where table_name='t1'; partition_name table_rows @@ -325,10 +325,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a+b) -(PARTITION p2 VALUES IN (1,2,3,7) ENGINE = MyISAM, - PARTITION p1 VALUES IN (21,0) ENGINE = MyISAM, - PARTITION p0 DEFAULT ENGINE = MyISAM) + PARTITION BY LIST (`a` + `b`) +(PARTITION `p2` VALUES IN (1,2,3,7) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (21,0) ENGINE = MyISAM, + PARTITION `p0` DEFAULT ENGINE = MyISAM) select * from t1; a b 2 5 @@ -362,10 +362,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a+5) -(PARTITION p2 VALUES IN (1,2,3,7) ENGINE = MyISAM, - PARTITION p1 VALUES IN (0) ENGINE = MyISAM, - PARTITION p0 DEFAULT ENGINE = MyISAM) + PARTITION BY LIST (`a` + 5) +(PARTITION `p2` VALUES IN (1,2,3,7) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `p0` DEFAULT ENGINE = MyISAM) select * from t1; a b 2 5 @@ -832,10 +832,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p2 VALUES IN (1,2,3) ENGINE = MyISAM, - PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM, - PARTITION p0 DEFAULT ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p2` VALUES IN (1,2,3) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (20,0) ENGINE = MyISAM, + PARTITION `p0` DEFAULT ENGINE = MyISAM) select * from t1; a b 2 5 @@ -866,10 +866,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p2 VALUES IN (1,2,3) ENGINE = MyISAM, - PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM, - PARTITION p0 VALUES IN (10) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p2` VALUES IN (1,2,3) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (20,0) ENGINE = MyISAM, + PARTITION `p0` VALUES IN (10) ENGINE = MyISAM) select * from t1; a b 2 5 @@ -900,10 +900,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p2 DEFAULT ENGINE = MyISAM, - PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM, - PARTITION p0 VALUES IN (10) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p2` DEFAULT ENGINE = MyISAM, + PARTITION `p1` VALUES IN (20,0) ENGINE = MyISAM, + PARTITION `p0` VALUES IN (10) ENGINE = MyISAM) select * from t1; a b 2 5 @@ -927,9 +927,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM, - PARTITION p0 VALUES IN (10) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p1` VALUES IN (20,0) ENGINE = MyISAM, + PARTITION `p0` VALUES IN (10) ENGINE = MyISAM) select * from t1; a b 0 0 @@ -945,10 +945,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM, - PARTITION p0 VALUES IN (10) ENGINE = MyISAM, - PARTITION pd DEFAULT ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p1` VALUES IN (20,0) ENGINE = MyISAM, + PARTITION `p0` VALUES IN (10) ENGINE = MyISAM, + PARTITION `pd` DEFAULT ENGINE = MyISAM) alter table t1 add partition (PARTITION pdd DEFAULT); ERROR HY000: Only one DEFAULT partition allowed alter table t1 drop partition pd; @@ -977,10 +977,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a,b) -(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM, - PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, - PARTITION p0 DEFAULT ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`,`b`) +(PARTITION `p2` VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM, + PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, + PARTITION `p0` DEFAULT ENGINE = MyISAM) select * from t1; a b 2 5 @@ -1011,10 +1011,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a,b) -(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM, - PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, - PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`,`b`) +(PARTITION `p2` VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM, + PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, + PARTITION `p0` VALUES IN ((10,10)) ENGINE = MyISAM) select * from t1; a b 2 5 @@ -1045,10 +1045,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a,b) -(PARTITION p2 DEFAULT ENGINE = MyISAM, - PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, - PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`,`b`) +(PARTITION `p2` DEFAULT ENGINE = MyISAM, + PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, + PARTITION `p0` VALUES IN ((10,10)) ENGINE = MyISAM) select * from t1; a b 2 5 @@ -1072,9 +1072,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a,b) -(PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, - PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`,`b`) +(PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, + PARTITION `p0` VALUES IN ((10,10)) ENGINE = MyISAM) select * from t1; a b 0 0 @@ -1090,10 +1090,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a,b) -(PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, - PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM, - PARTITION pd DEFAULT ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`,`b`) +(PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM, + PARTITION `p0` VALUES IN ((10,10)) ENGINE = MyISAM, + PARTITION `pd` DEFAULT ENGINE = MyISAM) alter table t1 add partition (PARTITION pdd DEFAULT); ERROR HY000: Only one DEFAULT partition allowed alter table t1 drop partition pd; @@ -1138,10 +1138,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a,b) -(PARTITION p0 DEFAULT ENGINE = MyISAM, - PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM, - PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`,`b`) +(PARTITION `p0` DEFAULT ENGINE = MyISAM, + PARTITION `p2` VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM, + PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM) drop table t1; # # MDEV-10765: Wrong result - query does not retrieve values from @@ -1245,8 +1245,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (i) -(PARTITION pdef DEFAULT ENGINE = MyISAM) + PARTITION BY LIST (`i`) +(PARTITION `pdef` DEFAULT ENGINE = MyISAM) DROP TABLE t1; CREATE TABLE t1 (i INT) PARTITION BY LIST (i) @@ -1262,6 +1262,6 @@ Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (i) -(PARTITION p VALUES IN (1,2,3,4) ENGINE = MyISAM) + PARTITION BY LIST (`i`) +(PARTITION `p` VALUES IN (1,2,3,4) ENGINE = MyISAM) DROP TABLE t1; diff --git a/mysql-test/r/partition_error.result b/mysql-test/r/partition_error.result index e52c1ef7df5..349e9771367 100644 --- a/mysql-test/r/partition_error.result +++ b/mysql-test/r/partition_error.result @@ -781,9 +781,9 @@ t1 CREATE TABLE `t1` ( `id` int(11) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE= DEFAULT CHARSET=latin1 - PARTITION BY RANGE (YEAR(purchased)) -SUBPARTITION BY HASH (TO_DAYS(purchased)) -(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = ) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) +(PARTITION `p0` VALUES LESS THAN MAXVALUE ENGINE = ) DROP TABLE t1; CREATE TABLE t1 (id INT, purchased DATE) PARTITION BY RANGE(YEAR(purchased)) @@ -802,11 +802,11 @@ t1 CREATE TABLE `t1` ( `id` int(11) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE= DEFAULT CHARSET=latin1 - PARTITION BY RANGE (YEAR(purchased)) -SUBPARTITION BY HASH (TO_DAYS(purchased)) -(PARTITION p0 VALUES LESS THAN MAXVALUE - (SUBPARTITION sp0 ENGINE = , - SUBPARTITION sp1 ENGINE = )) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) +(PARTITION `p0` VALUES LESS THAN MAXVALUE + (SUBPARTITION `sp0` ENGINE = , + SUBPARTITION `sp1` ENGINE = )) DROP TABLE t1; CREATE TABLE t1 (id INT, purchased DATE) PARTITION BY RANGE(YEAR(purchased)) @@ -822,8 +822,8 @@ t1 CREATE TABLE `t1` ( `id` int(11) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE= DEFAULT CHARSET=latin1 - PARTITION BY RANGE (YEAR(purchased)) -(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = ) + PARTITION BY RANGE (year(`purchased`)) +(PARTITION `p0` VALUES LESS THAN MAXVALUE ENGINE = ) DROP TABLE t1; SET @@sql_mode= @org_mode; CREATE TABLE t1 (a INTEGER NOT NULL, PRIMARY KEY (a)); @@ -1783,14 +1783,14 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -SUBPARTITION BY HASH (a) -(PARTITION p1 VALUES IN (1) - (SUBPARTITION p1spFirst COMMENT = 'SubPartition comment in p1spFirst' ENGINE = MyISAM, - SUBPARTITION p1spSecond COMMENT = 'SubPartition comment in p1spSecond' ENGINE = MyISAM), - PARTITION p2 VALUES IN (2) - (SUBPARTITION p2spFirst COMMENT = 'SubPartition comment in p2spFirst' ENGINE = MyISAM, - SUBPARTITION p2spSecond COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM)) + PARTITION BY LIST (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `p1` VALUES IN (1) + (SUBPARTITION `p1spFirst` COMMENT = 'SubPartition comment in p1spFirst' ENGINE = MyISAM, + SUBPARTITION `p1spSecond` COMMENT = 'SubPartition comment in p1spSecond' ENGINE = MyISAM), + PARTITION `p2` VALUES IN (2) + (SUBPARTITION `p2spFirst` COMMENT = 'SubPartition comment in p2spFirst' ENGINE = MyISAM, + SUBPARTITION `p2spSecond` COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM)) SELECT PARTITION_NAME, SUBPARTITION_NAME, PARTITION_COMMENT FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test'; PARTITION_NAME SUBPARTITION_NAME PARTITION_COMMENT @@ -1813,14 +1813,14 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -SUBPARTITION BY HASH (a) -(PARTITION p1 VALUES IN (1) - (SUBPARTITION p1spFirst COMMENT = 'SubPartition comment in p1spFirst' ENGINE = MyISAM, - SUBPARTITION p1spSecond ENGINE = MyISAM), - PARTITION p2 VALUES IN (2) - (SUBPARTITION p2spFirst COMMENT = 'Comment in p2' ENGINE = MyISAM, - SUBPARTITION p2spSecond COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM)) + PARTITION BY LIST (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `p1` VALUES IN (1) + (SUBPARTITION `p1spFirst` COMMENT = 'SubPartition comment in p1spFirst' ENGINE = MyISAM, + SUBPARTITION `p1spSecond` ENGINE = MyISAM), + PARTITION `p2` VALUES IN (2) + (SUBPARTITION `p2spFirst` COMMENT = 'Comment in p2' ENGINE = MyISAM, + SUBPARTITION `p2spSecond` COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM)) SELECT PARTITION_NAME, SUBPARTITION_NAME, PARTITION_COMMENT FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test'; PARTITION_NAME SUBPARTITION_NAME PARTITION_COMMENT @@ -1850,14 +1850,14 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, KEY `inx_a` (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a) -(PARTITION pUpTo10 VALUES LESS THAN (10) + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `pUpTo10` VALUES LESS THAN (10) (SUBPARTITION `p-10sp0` COMMENT = 'This is a long comment (2050 ascii characters) 50 pUpTo10 partition ......80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM, SUBPARTITION `p-10sp1` COMMENT = 'This is a long comment (2050 ascii characters) 50 pUpTo10 partition ......80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM), - PARTITION pMax VALUES LESS THAN MAXVALUE - (SUBPARTITION pMaxsp0 COMMENT = 'This is a long comment (2050 ascii characters) 50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM, - SUBPARTITION pMaxsp1 COMMENT = 'This is a long comment (2050 ascii characters) 50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM)) + PARTITION `pMax` VALUES LESS THAN MAXVALUE + (SUBPARTITION `pMaxsp0` COMMENT = 'This is a long comment (2050 ascii characters) 50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM, + SUBPARTITION `pMaxsp1` COMMENT = 'This is a long comment (2050 ascii characters) 50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM)) SELECT PARTITION_NAME, SUBPARTITION_NAME, PARTITION_COMMENT FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test'; PARTITION_NAME SUBPARTITION_NAME PARTITION_COMMENT diff --git a/mysql-test/r/partition_example.result b/mysql-test/r/partition_example.result index 9e1a4ccdad9..3aa1ed639ca 100644 --- a/mysql-test/r/partition_example.result +++ b/mysql-test/r/partition_example.result @@ -8,9 +8,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL ) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (1) ENGINE = EXAMPLE, - PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (1) ENGINE = EXAMPLE, + PARTITION `p1` VALUES IN (2) ENGINE = EXAMPLE) drop table t1; create table t1 (a int not null) engine=example ull=12340 @@ -21,9 +21,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL ) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `ull`=12340 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (1) ENGINE = EXAMPLE, - PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (1) ENGINE = EXAMPLE, + PARTITION `p1` VALUES IN (2) ENGINE = EXAMPLE) drop table t1; select 1; 1 diff --git a/mysql-test/r/partition_exchange.result b/mysql-test/r/partition_exchange.result index f7b2d7647ff..f37ba183560 100644 --- a/mysql-test/r/partition_exchange.result +++ b/mysql-test/r/partition_exchange.result @@ -28,7 +28,7 @@ Create Table CREATE TABLE `t1` ( `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT - PARTITION BY HASH (id) + PARTITION BY HASH (`id`) PARTITIONS 2 SHOW CREATE TABLE t2; Table t2 @@ -64,7 +64,7 @@ Create Table CREATE TABLE `t1` ( `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT - PARTITION BY HASH (id) + PARTITION BY HASH (`id`) PARTITIONS 2 SHOW CREATE TABLE t2; Table t2 @@ -112,7 +112,7 @@ Create Table CREATE TABLE `t1` ( `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT - PARTITION BY HASH (id) + PARTITION BY HASH (`id`) PARTITIONS 2 SHOW CREATE TABLE t2; Table t2 @@ -172,7 +172,7 @@ Create Table CREATE TABLE `t1` ( `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (id) + PARTITION BY HASH (`id`) PARTITIONS 2 SHOW CREATE TABLE t2; Table t2 @@ -232,7 +232,7 @@ Create Table CREATE TABLE `t1` ( `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (id) + PARTITION BY HASH (`id`) PARTITIONS 2 SHOW CREATE TABLE t2; Table t2 @@ -292,7 +292,7 @@ Create Table CREATE TABLE `t1` ( `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT - PARTITION BY HASH (id) + PARTITION BY HASH (`id`) PARTITIONS 2 SHOW CREATE TABLE t2; Table t2 @@ -349,7 +349,7 @@ Create Table CREATE TABLE `t1` ( `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (id) + PARTITION BY HASH (`id`) PARTITIONS 2 SHOW CREATE TABLE t2; Table t2 @@ -406,7 +406,7 @@ Create Table CREATE TABLE `t1` ( `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT - PARTITION BY HASH (id) + PARTITION BY HASH (`id`) PARTITIONS 2 SHOW CREATE TABLE t2; Table t2 @@ -496,9 +496,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t; a b 1 First value @@ -534,9 +534,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t; a b 10 Ten @@ -594,9 +594,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t; a b 1 First value @@ -650,9 +650,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SHOW CREATE TABLE tsp; Table Create Table tsp CREATE TABLE `tsp` ( @@ -660,14 +660,14 @@ tsp CREATE TABLE `tsp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a) -(PARTITION p0 VALUES LESS THAN (100) - (SUBPARTITION sp0 ENGINE = MyISAM, - SUBPARTITION sp1 ENGINE = MyISAM), - PARTITION p1 VALUES LESS THAN MAXVALUE - (SUBPARTITION sp2 ENGINE = MyISAM, - SUBPARTITION sp3 ENGINE = MyISAM)) + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `p0` VALUES LESS THAN (100) + (SUBPARTITION `sp0` ENGINE = MyISAM, + SUBPARTITION `sp1` ENGINE = MyISAM), + PARTITION `p1` VALUES LESS THAN MAXVALUE + (SUBPARTITION `sp2` ENGINE = MyISAM, + SUBPARTITION `sp3` ENGINE = MyISAM)) SELECT * FROM t; a b 1 First value @@ -704,9 +704,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t; a b 10 Ten @@ -742,9 +742,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t; a b 1 First value @@ -781,14 +781,14 @@ tsp CREATE TABLE `tsp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a) -(PARTITION p0 VALUES LESS THAN (100) - (SUBPARTITION sp0 ENGINE = MyISAM, - SUBPARTITION sp1 ENGINE = MyISAM), - PARTITION p1 VALUES LESS THAN MAXVALUE - (SUBPARTITION sp2 ENGINE = MyISAM, - SUBPARTITION sp3 ENGINE = MyISAM)) + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `p0` VALUES LESS THAN (100) + (SUBPARTITION `sp0` ENGINE = MyISAM, + SUBPARTITION `sp1` ENGINE = MyISAM), + PARTITION `p1` VALUES LESS THAN MAXVALUE + (SUBPARTITION `sp2` ENGINE = MyISAM, + SUBPARTITION `sp3` ENGINE = MyISAM)) SELECT * FROM t; a b 61 Sixty one @@ -826,9 +826,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t; a b 1 First value @@ -864,9 +864,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t; a b 10 Ten @@ -905,9 +905,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t; ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB SHOW CREATE TABLE t; @@ -924,9 +924,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) # Test different charsets ALTER TABLE t ENGINE = MyISAM; CREATE TABLE tmp LIKE t; @@ -957,9 +957,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t; ERROR HY000: Non matching attribute 'MAX_ROWS' between partition and table SHOW WARNINGS; @@ -988,9 +988,9 @@ tp CREATE TABLE `tp` ( PRIMARY KEY (`a`), KEY `ba_key` (`b`,`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t; a b 10 Ten @@ -1047,9 +1047,9 @@ tp CREATE TABLE `tp` ( PRIMARY KEY (`a`), KEY `ba_key` (`b`,`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t; ERROR HY000: Table to exchange with partition is temporary: 't' SHOW CREATE TABLE t; @@ -1068,9 +1068,9 @@ tp CREATE TABLE `tp` ( PRIMARY KEY (`a`), KEY `ba_key` (`b`,`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) DROP TEMPORARY TABLE t; ALTER TABLE tmp2 RENAME TO t; # Test non partitioned table diff --git a/mysql-test/r/partition_explicit_prune.result b/mysql-test/r/partition_explicit_prune.result index 1a3f5029978..a29f1aa7a8a 100644 --- a/mysql-test/r/partition_explicit_prune.result +++ b/mysql-test/r/partition_explicit_prune.result @@ -202,20 +202,20 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`a`), KEY `b` (`b`,`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a) -(PARTITION pNeg VALUES LESS THAN (0) - (SUBPARTITION subp0 ENGINE = InnoDB, - SUBPARTITION subp1 ENGINE = InnoDB), + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `pNeg` VALUES LESS THAN (0) + (SUBPARTITION `subp0` ENGINE = InnoDB, + SUBPARTITION `subp1` ENGINE = InnoDB), PARTITION `p0-9` VALUES LESS THAN (10) - (SUBPARTITION subp2 ENGINE = InnoDB, - SUBPARTITION subp3 ENGINE = InnoDB), + (SUBPARTITION `subp2` ENGINE = InnoDB, + SUBPARTITION `subp3` ENGINE = InnoDB), PARTITION `p10-99` VALUES LESS THAN (100) - (SUBPARTITION subp4 ENGINE = InnoDB, - SUBPARTITION subp5 ENGINE = InnoDB), + (SUBPARTITION `subp4` ENGINE = InnoDB, + SUBPARTITION `subp5` ENGINE = InnoDB), PARTITION `p100-99999` VALUES LESS THAN (100000) - (SUBPARTITION subp6 ENGINE = InnoDB, - SUBPARTITION subp7 ENGINE = InnoDB)) + (SUBPARTITION `subp6` ENGINE = InnoDB, + SUBPARTITION `subp7` ENGINE = InnoDB)) # First test that the syntax is OK SHOW CREATE TABLE t1 PARTITION (subp0); ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'PARTITION (subp0)' at line 1 @@ -1125,20 +1125,20 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`a`), KEY `b` (`b`,`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a) -(PARTITION pNeg VALUES LESS THAN (0) - (SUBPARTITION subp0 ENGINE = InnoDB, - SUBPARTITION subp1 ENGINE = InnoDB), + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `pNeg` VALUES LESS THAN (0) + (SUBPARTITION `subp0` ENGINE = InnoDB, + SUBPARTITION `subp1` ENGINE = InnoDB), PARTITION `p0-9` VALUES LESS THAN (10) - (SUBPARTITION subp2 ENGINE = InnoDB, - SUBPARTITION subp3 ENGINE = InnoDB), + (SUBPARTITION `subp2` ENGINE = InnoDB, + SUBPARTITION `subp3` ENGINE = InnoDB), PARTITION `p10-99` VALUES LESS THAN (100) - (SUBPARTITION subp4 ENGINE = InnoDB, - SUBPARTITION subp5 ENGINE = InnoDB), + (SUBPARTITION `subp4` ENGINE = InnoDB, + SUBPARTITION `subp5` ENGINE = InnoDB), PARTITION `p100-99999` VALUES LESS THAN (100000) - (SUBPARTITION subp6 ENGINE = InnoDB, - SUBPARTITION subp7 ENGINE = InnoDB)) + (SUBPARTITION `subp6` ENGINE = InnoDB, + SUBPARTITION `subp7` ENGINE = InnoDB)) SELECT * FROM t1; a b -4 (pNeg-)subp0, Updated, Updated2, Updated from a = -2 @@ -1157,20 +1157,20 @@ t2 CREATE TABLE `t2` ( PRIMARY KEY (`a`), KEY `b` (`b`,`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a) -(PARTITION pNeg VALUES LESS THAN (0) - (SUBPARTITION subp0 ENGINE = InnoDB, - SUBPARTITION subp1 ENGINE = InnoDB), + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `pNeg` VALUES LESS THAN (0) + (SUBPARTITION `subp0` ENGINE = InnoDB, + SUBPARTITION `subp1` ENGINE = InnoDB), PARTITION `p0-9` VALUES LESS THAN (10) - (SUBPARTITION subp2 ENGINE = InnoDB, - SUBPARTITION subp3 ENGINE = InnoDB), + (SUBPARTITION `subp2` ENGINE = InnoDB, + SUBPARTITION `subp3` ENGINE = InnoDB), PARTITION `p10-99` VALUES LESS THAN (100) - (SUBPARTITION subp4 ENGINE = InnoDB, - SUBPARTITION subp5 ENGINE = InnoDB), + (SUBPARTITION `subp4` ENGINE = InnoDB, + SUBPARTITION `subp5` ENGINE = InnoDB), PARTITION `p100-99999` VALUES LESS THAN (100000) - (SUBPARTITION subp6 ENGINE = InnoDB, - SUBPARTITION subp7 ENGINE = InnoDB)) + (SUBPARTITION `subp6` ENGINE = InnoDB, + SUBPARTITION `subp7` ENGINE = InnoDB)) SELECT * FROM t2; a b 10 p10-99 @@ -1657,28 +1657,28 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`a`), KEY `b` (`b`,`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a) -(PARTITION pNeg VALUES LESS THAN (0) - (SUBPARTITION subp0 ENGINE = InnoDB, - SUBPARTITION subp1 ENGINE = InnoDB, - SUBPARTITION subp2 ENGINE = InnoDB), + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a`) +(PARTITION `pNeg` VALUES LESS THAN (0) + (SUBPARTITION `subp0` ENGINE = InnoDB, + SUBPARTITION `subp1` ENGINE = InnoDB, + SUBPARTITION `subp2` ENGINE = InnoDB), PARTITION `p0-29` VALUES LESS THAN (30) - (SUBPARTITION subp3 ENGINE = InnoDB, - SUBPARTITION subp4 ENGINE = InnoDB, - SUBPARTITION subp5 ENGINE = InnoDB), + (SUBPARTITION `subp3` ENGINE = InnoDB, + SUBPARTITION `subp4` ENGINE = InnoDB, + SUBPARTITION `subp5` ENGINE = InnoDB), PARTITION `p30-299` VALUES LESS THAN (300) - (SUBPARTITION subp6 ENGINE = InnoDB, - SUBPARTITION subp7 ENGINE = InnoDB, - SUBPARTITION subp8 ENGINE = InnoDB), + (SUBPARTITION `subp6` ENGINE = InnoDB, + SUBPARTITION `subp7` ENGINE = InnoDB, + SUBPARTITION `subp8` ENGINE = InnoDB), PARTITION `p300-2999` VALUES LESS THAN (3000) - (SUBPARTITION subp9 ENGINE = InnoDB, - SUBPARTITION subp10 ENGINE = InnoDB, - SUBPARTITION subp11 ENGINE = InnoDB), + (SUBPARTITION `subp9` ENGINE = InnoDB, + SUBPARTITION `subp10` ENGINE = InnoDB, + SUBPARTITION `subp11` ENGINE = InnoDB), PARTITION `p3000-299999` VALUES LESS THAN (300000) - (SUBPARTITION subp12 ENGINE = InnoDB, - SUBPARTITION subp13 ENGINE = InnoDB, - SUBPARTITION subp14 ENGINE = InnoDB)) + (SUBPARTITION `subp12` ENGINE = InnoDB, + SUBPARTITION `subp13` ENGINE = InnoDB, + SUBPARTITION `subp14` ENGINE = InnoDB)) INSERT INTO t1 VALUES (-9, "negative nine"), (-8, "-8"), (-7, "-7"), (-6, "-6"), (-5, "-5"), (-4, "-4"), (-3, "-3"), (-2, "-2"), (-1, "-1"); INSERT INTO t1 VALUES (9, "nine"), (8, "8"), (7, "7"), (6, "6"), (5, "5"), (4, "4"), (3, "3"), (2, "2"), (1, "1"); INSERT INTO t1 VALUES (39, "Thirty nine"), (38, "38"), (37, "37"), (36, "36"), (35, "35"), (34, "34"), (33, "33"), (32, "32"), (31, "31"); diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result index 047b6dac2b6..c74f25928a9 100644 --- a/mysql-test/r/partition_innodb.result +++ b/mysql-test/r/partition_innodb.result @@ -447,7 +447,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) drop table t1; create table t1 (a int) engine = innodb @@ -461,8 +461,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0) ENGINE = InnoDB) drop table t1; SET SQL_MODE=default; create table t1 @@ -540,10 +540,10 @@ t1 CREATE TABLE `t1` ( `int_column` int(11) DEFAULT NULL, `char_column` char(5) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (int_column) -SUBPARTITION BY KEY (char_column) + PARTITION BY RANGE (`int_column`) +SUBPARTITION BY KEY (`char_column`) SUBPARTITIONS 2 -(PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) +(PARTITION `p1` VALUES LESS THAN (5) ENGINE = MyISAM) drop table t1; CREATE TABLE t1 (a INT) ENGINE=InnoDB PARTITION BY list(a) (PARTITION p1 VALUES IN (1)); @@ -588,7 +588,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 2 SELECT * FROM t1; a b diff --git a/mysql-test/r/partition_innodb_plugin.result b/mysql-test/r/partition_innodb_plugin.result index 60cea8496b0..6842ff04caa 100644 --- a/mysql-test/r/partition_innodb_plugin.result +++ b/mysql-test/r/partition_innodb_plugin.result @@ -30,9 +30,9 @@ t1 CREATE TABLE `t1` ( `id2` bigint(20) NOT NULL, PRIMARY KEY (`id`,`time`) ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 - PARTITION BY RANGE (TO_DAYS(time)) -(PARTITION p10 VALUES LESS THAN (734708) ENGINE = InnoDB, - PARTITION p20 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (to_days(`time`)) +(PARTITION `p10` VALUES LESS THAN (734708) ENGINE = InnoDB, + PARTITION `p20` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) DROP TABLE t1; call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal"); # @@ -59,7 +59,7 @@ t1 CREATE TABLE `t1` ( `user_num` char(10) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4 - PARTITION BY HASH (id) + PARTITION BY HASH (`id`) PARTITIONS 1 SET GLOBAL innodb_file_per_table = OFF; disconnect con1; @@ -97,7 +97,7 @@ t1 CREATE TABLE `t1` ( `user_num` char(10) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4 - PARTITION BY HASH (id) + PARTITION BY HASH (`id`) PARTITIONS 3 DROP TABLE t1; disconnect con2; diff --git a/mysql-test/r/partition_list.result b/mysql-test/r/partition_list.result index 2e95f882217..91c1c106cea 100644 --- a/mysql-test/r/partition_list.result +++ b/mysql-test/r/partition_list.result @@ -57,14 +57,14 @@ partition p3 values in (3)); select partition_method, partition_expression, partition_description from information_schema.partitions where table_name = "t1"; partition_method partition_expression partition_description -LIST a 0 -LIST a 0 -LIST a 1 -LIST a 1 -LIST a NULL,2 -LIST a NULL,2 -LIST a 3 -LIST a 3 +LIST `a` 0 +LIST `a` 0 +LIST `a` 1 +LIST `a` 1 +LIST `a` NULL,2 +LIST `a` NULL,2 +LIST `a` 3 +LIST `a` 3 insert into t1 values (0,0),(0,1),(1,0),(1,1),(null,0),(null,1); insert into t1 values (2,0),(2,1),(3,0),(3,1); explain partitions select * from t1 where a is null; diff --git a/mysql-test/r/partition_mgm.result b/mysql-test/r/partition_mgm.result index 2acaf7356ef..37733a4e764 100644 --- a/mysql-test/r/partition_mgm.result +++ b/mysql-test/r/partition_mgm.result @@ -24,7 +24,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) + PARTITION BY HASH (year(`f_date`)) PARTITIONS 2 ALTER TABLE t1 COALESCE PARTITION 1; SHOW CREATE TABLE t1; @@ -33,7 +33,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) + PARTITION BY HASH (year(`f_date`)) PARTITIONS 1 drop table t1; create table t1 (a int) @@ -58,7 +58,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 5 DROP TABLE t1; CREATE TABLE t1 (a INT) @@ -70,7 +70,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 5 DROP TABLE t1; CREATE TABLE t1 (a INT) @@ -81,7 +81,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 5 DROP TABLE t1; CREATE TABLE t1 (a INT) /*!50100 PARTITION BY HASH (a) PARTITIONS 5 */; @@ -90,6 +90,6 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 5 DROP TABLE t1; diff --git a/mysql-test/r/partition_mgm_err.result b/mysql-test/r/partition_mgm_err.result index 9cfe0594a0c..e3c4bbf2af7 100644 --- a/mysql-test/r/partition_mgm_err.result +++ b/mysql-test/r/partition_mgm_err.result @@ -145,7 +145,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 2 DROP TABLE t1; CREATE TABLE t1 (a INT) PARTITION BY HASH(a); diff --git a/mysql-test/r/partition_myisam.result b/mysql-test/r/partition_myisam.result index 664eb60c2c5..8f35075261a 100644 --- a/mysql-test/r/partition_myisam.result +++ b/mysql-test/r/partition_myisam.result @@ -27,10 +27,10 @@ Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 CHECKSUM=1 - PARTITION BY RANGE (i) -(PARTITION p3 VALUES LESS THAN (3) ENGINE = MyISAM, - PARTITION p5 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`i`) +(PARTITION `p3` VALUES LESS THAN (3) ENGINE = MyISAM, + PARTITION `p5` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `pMax` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) DROP TABLE t1; # Same test without partitioning CREATE TABLE t1 ( @@ -131,7 +131,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`a`) ) ENGINE=MyISAM AUTO_INCREMENT=14 DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) INSERT INTO t1 VALUES (NULL); SELECT * FROM t1; a diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result index afde7977961..03282ac134a 100644 --- a/mysql-test/r/partition_not_windows.result +++ b/mysql-test/r/partition_not_windows.result @@ -31,8 +31,8 @@ Table Create Table t2 CREATE TABLE `t2` ( `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (i) -(PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM) + PARTITION BY RANGE (`i`) +(PARTITION `p01` VALUES LESS THAN (1000) ENGINE = MyISAM) DROP TABLE t1, t2; set @@sql_mode=@org_mode; CREATE TABLE t1(a INT) diff --git a/mysql-test/r/partition_range.result b/mysql-test/r/partition_range.result index 94c727f6339..dd9e074db0c 100644 --- a/mysql-test/r/partition_range.result +++ b/mysql-test/r/partition_range.result @@ -22,9 +22,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` datetime DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (TO_DAYS(a)) -SUBPARTITION BY HASH (to_seconds(a)) -(PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM) + PARTITION BY RANGE (to_days(`a`)) +SUBPARTITION BY HASH (to_seconds(`a`)) +(PARTITION `p0` VALUES LESS THAN (1) ENGINE = MyISAM) drop table t1; create table t1 (a int) partition by range (a) @@ -38,8 +38,8 @@ partition p1 VALUES LESS THAN (TO_SECONDS('2007-04-01 00:00:00'))); select partition_method, partition_expression, partition_description from information_schema.partitions where table_name = "t1"; partition_method partition_expression partition_description -RANGE TO_SECONDS(a) 63340531200 -RANGE TO_SECONDS(a) 63342604800 +RANGE to_seconds(`a`) 63340531200 +RANGE to_seconds(`a`) 63342604800 INSERT INTO t1 VALUES ('2007-03-01 12:00:00'), ('2007-03-07 12:00:00'); INSERT INTO t1 VALUES ('2007-03-08 12:00:00'), ('2007-03-15 12:00:00'); explain partitions select * from t1 where a < '2007-03-08 00:00:00'; @@ -62,9 +62,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` datetime NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (TO_SECONDS(a)) -(PARTITION p0 VALUES LESS THAN (63340531200) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (63342604800) ENGINE = MyISAM) + PARTITION BY RANGE (to_seconds(`a`)) +(PARTITION `p0` VALUES LESS THAN (63340531200) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (63342604800) ENGINE = MyISAM) drop table t1; create table t1 (a date) partition by range(to_seconds(a)) @@ -93,9 +93,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (to_seconds(a)) -(PARTITION p0 VALUES LESS THAN (63240134400) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (63271756800) ENGINE = MyISAM) + PARTITION BY RANGE (to_seconds(`a`)) +(PARTITION `p0` VALUES LESS THAN (63240134400) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (63271756800) ENGINE = MyISAM) drop table t1; create table t1 (a datetime) partition by range(to_seconds(a)) @@ -123,9 +123,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` datetime DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (to_seconds(a)) -(PARTITION p0 VALUES LESS THAN (63240177600) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (63271800000) ENGINE = MyISAM) + PARTITION BY RANGE (to_seconds(`a`)) +(PARTITION `p0` VALUES LESS THAN (63240177600) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (63271800000) ENGINE = MyISAM) drop table t1; create table t1 (a int, b char(20)) partition by range columns(a,b) @@ -153,8 +153,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) drop table t1; create table t1 (a integer) partition by range (a) @@ -284,10 +284,10 @@ t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, PRIMARY KEY (`a`,`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION x1 VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM, - PARTITION x2 VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM, - PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `x1` VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM, + PARTITION `x2` VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM, + PARTITION `x3` VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM) ALTER TABLE t1 partition by range (a) partitions 3 @@ -308,10 +308,10 @@ t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, PRIMARY KEY (`a`,`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION x1 VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM, - PARTITION x2 VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM, - PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `x1` VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM, + PARTITION `x2` VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM, + PARTITION `x3` VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM) drop table if exists t1; CREATE TABLE t1 ( a int not null, @@ -409,14 +409,14 @@ t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, PRIMARY KEY (`a`,`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a+b) -(PARTITION x1 VALUES LESS THAN (1) - (SUBPARTITION x11 ENGINE = MyISAM, - SUBPARTITION x12 ENGINE = MyISAM), - PARTITION x2 VALUES LESS THAN (5) - (SUBPARTITION x21 ENGINE = MyISAM, - SUBPARTITION x22 ENGINE = MyISAM)) + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a` + `b`) +(PARTITION `x1` VALUES LESS THAN (1) + (SUBPARTITION `x11` ENGINE = MyISAM, + SUBPARTITION `x12` ENGINE = MyISAM), + PARTITION `x2` VALUES LESS THAN (5) + (SUBPARTITION `x21` ENGINE = MyISAM, + SUBPARTITION `x22` ENGINE = MyISAM)) ALTER TABLE t1 ADD COLUMN d int; show create table t1; Table Create Table @@ -427,14 +427,14 @@ t1 CREATE TABLE `t1` ( `d` int(11) DEFAULT NULL, PRIMARY KEY (`a`,`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY HASH (a+b) -(PARTITION x1 VALUES LESS THAN (1) - (SUBPARTITION x11 ENGINE = MyISAM, - SUBPARTITION x12 ENGINE = MyISAM), - PARTITION x2 VALUES LESS THAN (5) - (SUBPARTITION x21 ENGINE = MyISAM, - SUBPARTITION x22 ENGINE = MyISAM)) + PARTITION BY RANGE (`a`) +SUBPARTITION BY HASH (`a` + `b`) +(PARTITION `x1` VALUES LESS THAN (1) + (SUBPARTITION `x11` ENGINE = MyISAM, + SUBPARTITION `x12` ENGINE = MyISAM), + PARTITION `x2` VALUES LESS THAN (5) + (SUBPARTITION `x21` ENGINE = MyISAM, + SUBPARTITION `x22` ENGINE = MyISAM)) drop table t1; CREATE TABLE t1 ( a int not null, @@ -658,9 +658,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (10) ENGINE = MyISAM) drop table t1; create table t1 (a bigint unsigned) partition by range (a) @@ -671,9 +671,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (2) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (2) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (10) ENGINE = MyISAM) insert into t1 values (0xFFFFFFFFFFFFFFFF); ERROR HY000: Table has no partition for value 18446744073709551615 drop table t1; diff --git a/mysql-test/r/partition_symlink.result b/mysql-test/r/partition_symlink.result index 3f175bb7534..474dd5adf02 100644 --- a/mysql-test/r/partition_symlink.result +++ b/mysql-test/r/partition_symlink.result @@ -22,10 +22,10 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM, - PARTITION p1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM, - PARTITION p2 VALUES IN (2) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM, + PARTITION `p1` VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM, + PARTITION `p2` VALUES IN (2) ENGINE = MyISAM) SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -158,8 +158,8 @@ Table Create Table t2 CREATE TABLE `t2` ( `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (i) -(PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM) + PARTITION BY RANGE (`i`) +(PARTITION `p01` VALUES LESS THAN (1000) ENGINE = MyISAM) DROP TABLE t1, t2; set @@sql_mode=@org_mode; create table t1 (a int) diff --git a/mysql-test/r/partition_utf8.result b/mysql-test/r/partition_utf8.result index c359980be51..7718e651423 100644 --- a/mysql-test/r/partition_utf8.result +++ b/mysql-test/r/partition_utf8.result @@ -7,8 +7,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(2) CHARACTER SET cp1250 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a) -(PARTITION p0 VALUES IN (_cp1250 0x81) ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`) +(PARTITION `p0` VALUES IN (_cp1250 0x81) ENGINE = MyISAM) drop table t1; create table t1 (a varchar(2) character set cp1250) partition by list columns (a) @@ -18,8 +18,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(2) CHARACTER SET cp1250 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a) -(PARTITION p0 VALUES IN ('€') ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`) +(PARTITION `p0` VALUES IN ('€') ENGINE = MyISAM) drop table t1; create table t1 (a varchar(1500), b varchar(1570)) partition by list columns(a,b) @@ -45,9 +45,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(2) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST COLUMNS(a) -(PARTITION p0 VALUES IN ('†') ENGINE = MyISAM, - PARTITION p1 VALUES IN ('') ENGINE = MyISAM) + PARTITION BY LIST COLUMNS(`a`) +(PARTITION `p0` VALUES IN ('†') ENGINE = MyISAM, + PARTITION `p1` VALUES IN ('') ENGINE = MyISAM) insert into t1 values (''); insert into t1 values (_ucs2 0x2020); drop table t1; diff --git a/mysql-test/r/type_datetime_hires.result b/mysql-test/r/type_datetime_hires.result index e2c2f83a96c..50354430e3f 100644 --- a/mysql-test/r/type_datetime_hires.result +++ b/mysql-test/r/type_datetime_hires.result @@ -322,12 +322,12 @@ INSERT INTO t2 VALUES ('2006-10-02 21:50:01.5678',9); select table_name,partition_name,partition_method,partition_expression,partition_description,table_rows from information_schema.partitions where table_name in ('t1', 't2'); table_name partition_name partition_method partition_expression partition_description table_rows -t1 p01 RANGE to_days(taken) 732920 0 -t1 p02 RANGE to_days(taken) 732950 7 -t1 p03 RANGE to_days(taken) MAXVALUE 3 -t2 p01 RANGE extract(microsecond from taken) 123000 3 -t2 p02 RANGE extract(microsecond from taken) 500000 4 -t2 p03 RANGE extract(microsecond from taken) MAXVALUE 3 +t1 p01 RANGE to_days(`taken`) 732920 0 +t1 p02 RANGE to_days(`taken`) 732950 7 +t1 p03 RANGE to_days(`taken`) MAXVALUE 3 +t2 p01 RANGE extract(microsecond from `taken`) 123000 3 +t2 p02 RANGE extract(microsecond from `taken`) 500000 4 +t2 p03 RANGE extract(microsecond from `taken`) MAXVALUE 3 drop table t1, t2; create table t1 (a datetime, b datetime(6)); insert t1 values ('2010-01-02 03:04:05.678912', '2010-01-02 03:04:05.678912'); diff --git a/mysql-test/suite/archive/partition_archive.result b/mysql-test/suite/archive/partition_archive.result index 1ed979f2c92..a2e0fe7420f 100644 --- a/mysql-test/suite/archive/partition_archive.result +++ b/mysql-test/suite/archive/partition_archive.result @@ -84,7 +84,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) drop table t1; CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT, f1 VARCHAR(25), @@ -109,20 +109,20 @@ t1 CREATE TABLE `t1` ( `f1` varchar(25) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=ARCHIVE AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -SUBPARTITION BY HASH (id) + PARTITION BY RANGE (`id`) +SUBPARTITION BY HASH (`id`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES LESS THAN (10) ENGINE = ARCHIVE, - PARTITION pa2 VALUES LESS THAN (20) ENGINE = ARCHIVE, - PARTITION pa3 VALUES LESS THAN (30) ENGINE = ARCHIVE, - PARTITION pa4 VALUES LESS THAN (40) ENGINE = ARCHIVE, - PARTITION pa5 VALUES LESS THAN (50) ENGINE = ARCHIVE, - PARTITION pa6 VALUES LESS THAN (60) ENGINE = ARCHIVE, - PARTITION pa7 VALUES LESS THAN (70) ENGINE = ARCHIVE, - PARTITION pa8 VALUES LESS THAN (80) ENGINE = ARCHIVE, - PARTITION pa9 VALUES LESS THAN (90) ENGINE = ARCHIVE, - PARTITION pa10 VALUES LESS THAN (100) ENGINE = ARCHIVE, - PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE) +(PARTITION `pa1` VALUES LESS THAN (10) ENGINE = ARCHIVE, + PARTITION `pa2` VALUES LESS THAN (20) ENGINE = ARCHIVE, + PARTITION `pa3` VALUES LESS THAN (30) ENGINE = ARCHIVE, + PARTITION `pa4` VALUES LESS THAN (40) ENGINE = ARCHIVE, + PARTITION `pa5` VALUES LESS THAN (50) ENGINE = ARCHIVE, + PARTITION `pa6` VALUES LESS THAN (60) ENGINE = ARCHIVE, + PARTITION `pa7` VALUES LESS THAN (70) ENGINE = ARCHIVE, + PARTITION `pa8` VALUES LESS THAN (80) ENGINE = ARCHIVE, + PARTITION `pa9` VALUES LESS THAN (90) ENGINE = ARCHIVE, + PARTITION `pa10` VALUES LESS THAN (100) ENGINE = ARCHIVE, + PARTITION `pa11` VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE) select count(*) from t1; count(*) 100 @@ -138,7 +138,7 @@ t1 CREATE TABLE `t1` ( `fld1` int(11) NOT NULL, PRIMARY KEY (`fld1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (fld1) + PARTITION BY HASH (`fld1`) PARTITIONS 5 ALTER TABLE t1 ENGINE= ARCHIVE; ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") @@ -149,7 +149,7 @@ t1 CREATE TABLE `t1` ( `fld1` int(11) NOT NULL, PRIMARY KEY (`fld1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (fld1) + PARTITION BY HASH (`fld1`) PARTITIONS 5 #Cleanup. DROP TABLE t1; diff --git a/mysql-test/suite/encryption/r/encryption_force.result b/mysql-test/suite/encryption/r/encryption_force.result index 164a0067062..730a32a4b27 100644 --- a/mysql-test/suite/encryption/r/encryption_force.result +++ b/mysql-test/suite/encryption/r/encryption_force.result @@ -31,7 +31,7 @@ Table Create Table t4 CREATE TABLE `t4` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 2 alter table t1 encrypted=no; ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") diff --git a/mysql-test/suite/federated/federated_partition.result b/mysql-test/suite/federated/federated_partition.result index 8485328a166..a2d5fcffd9b 100644 --- a/mysql-test/suite/federated/federated_partition.result +++ b/mysql-test/suite/federated/federated_partition.result @@ -21,9 +21,9 @@ t1 CREATE TABLE `t1` ( `s1` int(11) NOT NULL, PRIMARY KEY (`s1`) ) ENGINE=FEDERATED DEFAULT CHARSET=latin1 - PARTITION BY LIST (s1) -(PARTITION p1 VALUES IN (1,3) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_1' ENGINE = FEDERATED, - PARTITION p2 VALUES IN (2,4) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_2' ENGINE = FEDERATED) + PARTITION BY LIST (`s1`) +(PARTITION `p1` VALUES IN (1,3) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_1' ENGINE = FEDERATED, + PARTITION `p2` VALUES IN (2,4) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_2' ENGINE = FEDERATED) insert into t1 values (1), (2), (3), (4); select * from t1; s1 diff --git a/mysql-test/suite/gcol/r/innodb_virtual_basic.result b/mysql-test/suite/gcol/r/innodb_virtual_basic.result index 7212dbcc16f..bd44661f5dd 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_basic.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_basic.result @@ -1002,7 +1002,7 @@ t CREATE TABLE `t` ( KEY `col_date_key` (`col_date_key`,`col_time_key`,`col_datetime_key`), KEY `col_varchar_key` (`col_varchar_key`,`col_varchar_nokey`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (col_int_key) + PARTITION BY KEY (`col_int_key`) PARTITIONS 3 DROP TABLE t; CREATE TABLE t (a INT, b INT, c INT GENERATED ALWAYS AS(a+b), h VARCHAR(10)); diff --git a/mysql-test/suite/innodb_zip/r/restart.result b/mysql-test/suite/innodb_zip/r/restart.result index 4820914f760..88bd79cd428 100644 --- a/mysql-test/suite/innodb_zip/r/restart.result +++ b/mysql-test/suite/innodb_zip/r/restart.result @@ -145,10 +145,10 @@ t6_restart CREATE TABLE `t6_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 - PARTITION BY HASH (c1) -(PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) + PARTITION BY HASH (`c1`) +(PARTITION `p0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) SELECT count(*) FROM t6_restart; count(*) 16 @@ -181,14 +181,14 @@ t7_restart CREATE TABLE `t7_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC - PARTITION BY RANGE (c1) -SUBPARTITION BY HASH (c1) -(PARTITION p0 VALUES LESS THAN (10) - (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), - PARTITION p1 VALUES LESS THAN MAXVALUE - (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) + PARTITION BY RANGE (`c1`) +SUBPARTITION BY HASH (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) + (SUBPARTITION `s0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), + PARTITION `p1` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s3` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) SELECT count(*) FROM t7_restart; count(*) 16 @@ -325,10 +325,10 @@ t6_restart CREATE TABLE `t6_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 - PARTITION BY HASH (c1) -(PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) + PARTITION BY HASH (`c1`) +(PARTITION `p0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) SHOW CREATE TABLE t7_restart; Table Create Table t7_restart CREATE TABLE `t7_restart` ( @@ -339,14 +339,14 @@ t7_restart CREATE TABLE `t7_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC - PARTITION BY RANGE (c1) -SUBPARTITION BY HASH (c1) -(PARTITION p0 VALUES LESS THAN (10) - (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), - PARTITION p1 VALUES LESS THAN MAXVALUE - (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) + PARTITION BY RANGE (`c1`) +SUBPARTITION BY HASH (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) + (SUBPARTITION `s0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), + PARTITION `p1` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s3` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) INSERT INTO t1_restart (SELECT 0, c2, c3, c4, c5 FROM t1_restart); INSERT INTO t2_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart); INSERT INTO t3_restart (SELECT 0, c2, c3, c4, c5 FROM t3_restart); @@ -456,10 +456,10 @@ t6_restart CREATE TABLE `t6_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 - PARTITION BY HASH (c1) -(PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) + PARTITION BY HASH (`c1`) +(PARTITION `p0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) SELECT count(*) FROM t7_restart; count(*) 9 @@ -473,14 +473,14 @@ t7_restart CREATE TABLE `t7_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC - PARTITION BY RANGE (c1) -SUBPARTITION BY HASH (c1) -(PARTITION p0 VALUES LESS THAN (10) - (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), - PARTITION p1 VALUES LESS THAN MAXVALUE - (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) + PARTITION BY RANGE (`c1`) +SUBPARTITION BY HASH (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) + (SUBPARTITION `s0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), + PARTITION `p1` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s3` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) # # Shutdown the server and make a backup of a tablespace # @@ -555,10 +555,10 @@ t6_restart CREATE TABLE `t6_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 - PARTITION BY HASH (c1) -(PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) + PARTITION BY HASH (`c1`) +(PARTITION `p0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) SELECT count(*) FROM t7_restart; count(*) 9 @@ -572,14 +572,14 @@ t7_restart CREATE TABLE `t7_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC - PARTITION BY RANGE (c1) -SUBPARTITION BY HASH (c1) -(PARTITION p0 VALUES LESS THAN (10) - (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), - PARTITION p1 VALUES LESS THAN MAXVALUE - (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) + PARTITION BY RANGE (`c1`) +SUBPARTITION BY HASH (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) + (SUBPARTITION `s0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), + PARTITION `p1` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s3` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) # # Try to rename a tablespace to a file that already exists # @@ -657,10 +657,10 @@ t66_restart CREATE TABLE `t66_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 - PARTITION BY HASH (c1) -(PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) + PARTITION BY HASH (`c1`) +(PARTITION `p0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) INSERT INTO t77_restart (SELECT 0, c2, c3, c4, c5 FROM t77_restart); SELECT count(*) FROM t77_restart; count(*) @@ -675,14 +675,14 @@ t77_restart CREATE TABLE `t77_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC - PARTITION BY RANGE (c1) -SUBPARTITION BY HASH (c1) -(PARTITION p0 VALUES LESS THAN (10) - (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), - PARTITION p1 VALUES LESS THAN MAXVALUE - (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) + PARTITION BY RANGE (`c1`) +SUBPARTITION BY HASH (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) + (SUBPARTITION `s0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), + PARTITION `p1` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s3` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) ---- MYSQL_DATA_DIR/test t4_restart.frm t4_restart.ibd @@ -753,10 +753,10 @@ t66_restart CREATE TABLE `t66_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 - PARTITION BY HASH (c1) -(PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) + PARTITION BY HASH (`c1`) +(PARTITION `p0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + PARTITION `p2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) INSERT INTO t77_restart (SELECT 0, c2, c3, c4, c5 FROM t77_restart); SELECT count(*) FROM t77_restart; count(*) @@ -771,14 +771,14 @@ t77_restart CREATE TABLE `t77_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC - PARTITION BY RANGE (c1) -SUBPARTITION BY HASH (c1) -(PARTITION p0 VALUES LESS THAN (10) - (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), - PARTITION p1 VALUES LESS THAN MAXVALUE - (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, - SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) + PARTITION BY RANGE (`c1`) +SUBPARTITION BY HASH (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) + (SUBPARTITION `s0` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s1` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB), + PARTITION `p1` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB, + SUBPARTITION `s3` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) # # Shutdown the server # @@ -898,10 +898,10 @@ t66_restart CREATE TABLE `t66_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=179 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 - PARTITION BY HASH (c1) -(PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB, - PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB, - PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB) + PARTITION BY HASH (`c1`) +(PARTITION `p0` DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB, + PARTITION `p1` DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB, + PARTITION `p2` DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB) INSERT INTO t77_restart (SELECT 0, c2, c3, c4, c5 FROM t77_restart); SELECT count(*) FROM t77_restart; count(*) @@ -916,14 +916,14 @@ t77_restart CREATE TABLE `t77_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=73 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC - PARTITION BY RANGE (c1) -SUBPARTITION BY HASH (c1) -(PARTITION p0 VALUES LESS THAN (10) - (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB, - SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB), - PARTITION p1 VALUES LESS THAN MAXVALUE - (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB, - SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB)) + PARTITION BY RANGE (`c1`) +SUBPARTITION BY HASH (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) + (SUBPARTITION `s0` DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB, + SUBPARTITION `s1` DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB), + PARTITION `p1` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s2` DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB, + SUBPARTITION `s3` DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB)) # # Shutdown the server # @@ -1033,10 +1033,10 @@ t66_restart CREATE TABLE `t66_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=347 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 - PARTITION BY HASH (c1) -(PARTITION p0 ENGINE = InnoDB, - PARTITION p1 ENGINE = InnoDB, - PARTITION p2 ENGINE = InnoDB) + PARTITION BY HASH (`c1`) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `p1` ENGINE = InnoDB, + PARTITION `p2` ENGINE = InnoDB) INSERT INTO t77_restart (SELECT 0, c2, c3, c4, c5 FROM t77_restart); SELECT count(*) FROM t77_restart; count(*) @@ -1051,14 +1051,14 @@ t77_restart CREATE TABLE `t77_restart` ( `c5` text DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=145 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC - PARTITION BY RANGE (c1) -SUBPARTITION BY HASH (c1) -(PARTITION p0 VALUES LESS THAN (10) - (SUBPARTITION s0 ENGINE = InnoDB, - SUBPARTITION s1 ENGINE = InnoDB), - PARTITION p1 VALUES LESS THAN MAXVALUE - (SUBPARTITION s2 ENGINE = InnoDB, - SUBPARTITION s3 ENGINE = InnoDB)) + PARTITION BY RANGE (`c1`) +SUBPARTITION BY HASH (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) + (SUBPARTITION `s0` ENGINE = InnoDB, + SUBPARTITION `s1` ENGINE = InnoDB), + PARTITION `p1` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s2` ENGINE = InnoDB, + SUBPARTITION `s3` ENGINE = InnoDB)) # # Cleanup # diff --git a/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result b/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result index e0c16eeba74..617e2d258c2 100644 --- a/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result +++ b/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result @@ -620,15 +620,15 @@ t55 CREATE TABLE `t55` ( `colint` int(11) DEFAULT NULL, `col1` int(11) DEFAULT NULL ) ENGINE=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 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=InnoDB 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 = InnoDB, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) select * from t55 order by colint; colint col1 1 2006-02-03 diff --git a/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result b/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result index b211340a6ff..490a79155a2 100644 --- a/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result +++ b/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result @@ -620,15 +620,15 @@ t55 CREATE TABLE `t55` ( `colint` int(11) DEFAULT NULL, `col1` int(11) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 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=MyISAM 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 = MyISAM, - PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, - PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, - PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, - PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `p3` VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, + PARTITION `p4` VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, + PARTITION `p5` VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) select * from t55 order by colint; colint col1 1 2006-02-03 diff --git a/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result b/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result index b126d459335..ac56faae01e 100644 --- a/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result @@ -75,7 +75,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result index ae352a35a36..93862512ea1 100644 --- a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result @@ -75,7 +75,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -592,7 +592,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -1123,15 +1123,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -1665,13 +1665,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -2197,13 +2197,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -2737,20 +2737,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -3284,20 +3284,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -3829,12 +3829,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -4365,7 +4365,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -4882,7 +4882,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -5413,15 +5413,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -5955,13 +5955,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -6487,13 +6487,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -7027,20 +7027,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -7574,20 +7574,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -8119,12 +8119,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD diff --git a/mysql-test/suite/parts/r/partition_alter1_1_innodb.result b/mysql-test/suite/parts/r/partition_alter1_1_innodb.result index 30dd7222570..c0a14ee8de0 100644 --- a/mysql-test/suite/parts/r/partition_alter1_1_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter1_1_innodb.result @@ -393,7 +393,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result index 6c769bd8cd9..91dd960f516 100644 --- a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result @@ -234,7 +234,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -751,7 +751,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -1282,15 +1282,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -1824,13 +1824,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -2356,13 +2356,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -2898,20 +2898,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -3445,20 +3445,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -3990,12 +3990,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -4526,7 +4526,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -5043,7 +5043,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -5574,15 +5574,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -6116,13 +6116,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -6648,13 +6648,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -7190,20 +7190,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -7737,20 +7737,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -8282,12 +8282,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD diff --git a/mysql-test/suite/parts/r/partition_alter1_2_innodb.result b/mysql-test/suite/parts/r/partition_alter1_2_innodb.result index f4765293d15..9b00fb9d7b3 100644 --- a/mysql-test/suite/parts/r/partition_alter1_2_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter1_2_innodb.result @@ -73,7 +73,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result index 7001cbd17d2..e10fb459e99 100644 --- a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result @@ -72,7 +72,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -537,7 +537,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -1016,15 +1016,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -1506,13 +1506,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -1986,13 +1986,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -2476,20 +2476,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -2971,20 +2971,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -3464,12 +3464,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -3952,7 +3952,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -4417,7 +4417,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -4896,15 +4896,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -5386,13 +5386,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -5866,13 +5866,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -6354,20 +6354,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -6849,20 +6849,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -7342,12 +7342,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -7826,7 +7826,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -8291,7 +8291,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -8770,15 +8770,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -9260,13 +9260,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -9740,13 +9740,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -10228,20 +10228,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -10723,20 +10723,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -11216,12 +11216,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -11700,7 +11700,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -12165,7 +12165,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -12644,15 +12644,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -13134,13 +13134,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -13614,13 +13614,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -14102,20 +14102,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -14597,20 +14597,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -15090,12 +15090,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD diff --git a/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result b/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result index 22317d93724..cd0a3380311 100644 --- a/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result @@ -74,7 +74,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result b/mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result index 680edaa7cc7..cfca64afa1f 100644 --- a/mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result @@ -70,7 +70,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter2_1_maria.result b/mysql-test/suite/parts/r/partition_alter2_1_maria.result index 3ef0364c5a8..4504319a3fd 100644 --- a/mysql-test/suite/parts/r/partition_alter2_1_maria.result +++ b/mysql-test/suite/parts/r/partition_alter2_1_maria.result @@ -74,7 +74,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -539,7 +539,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -1018,15 +1018,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -1508,13 +1508,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -1988,13 +1988,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -2478,20 +2478,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -2973,20 +2973,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -3466,12 +3466,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD @@ -3952,7 +3952,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -4469,7 +4469,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -5000,15 +5000,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -5542,13 +5542,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -6074,13 +6074,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -6616,20 +6616,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -7163,20 +7163,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -7708,12 +7708,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD @@ -8244,7 +8244,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -8761,7 +8761,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -9292,15 +9292,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -9834,13 +9834,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -10366,13 +10366,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -10908,20 +10908,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -11455,20 +11455,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -12000,12 +12000,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD @@ -12540,7 +12540,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -13005,7 +13005,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -13484,15 +13484,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -13974,13 +13974,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -14454,13 +14454,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -14942,20 +14942,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -15437,20 +15437,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -15930,12 +15930,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD @@ -16416,7 +16416,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -16933,7 +16933,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -17464,15 +17464,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -18006,13 +18006,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -18538,13 +18538,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -19078,20 +19078,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -19625,20 +19625,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -20170,12 +20170,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD @@ -20706,7 +20706,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -21223,7 +21223,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -21754,15 +21754,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -22296,13 +22296,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -22828,13 +22828,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -23368,20 +23368,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -23915,20 +23915,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -24460,12 +24460,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD diff --git a/mysql-test/suite/parts/r/partition_alter2_1_myisam.result b/mysql-test/suite/parts/r/partition_alter2_1_myisam.result index 44550776616..ee587189113 100644 --- a/mysql-test/suite/parts/r/partition_alter2_1_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter2_1_myisam.result @@ -74,7 +74,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -539,7 +539,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -1018,15 +1018,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -1508,13 +1508,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -1988,13 +1988,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -2478,20 +2478,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -2973,20 +2973,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -3466,12 +3466,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -3952,7 +3952,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -4469,7 +4469,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -5000,15 +5000,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -5542,13 +5542,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -6074,13 +6074,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -6616,20 +6616,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -7163,20 +7163,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -7708,12 +7708,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -8244,7 +8244,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -8761,7 +8761,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -9292,15 +9292,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -9834,13 +9834,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -10366,13 +10366,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -10908,20 +10908,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -11455,20 +11455,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -12000,12 +12000,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -12540,7 +12540,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -13005,7 +13005,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -13484,15 +13484,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -13974,13 +13974,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -14454,13 +14454,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -14942,20 +14942,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -15437,20 +15437,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -15930,12 +15930,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -16416,7 +16416,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -16933,7 +16933,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -17464,15 +17464,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -18006,13 +18006,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -18538,13 +18538,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -19078,20 +19078,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -19625,20 +19625,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -20170,12 +20170,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -20706,7 +20706,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -21223,7 +21223,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -21754,15 +21754,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -22296,13 +22296,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -22828,13 +22828,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -23368,20 +23368,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -23915,20 +23915,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -24460,12 +24460,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD diff --git a/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result b/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result index 113fc7bb312..d6352fb9b1f 100644 --- a/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result @@ -74,7 +74,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result b/mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result index becbaddd927..4bf99bd6acc 100644 --- a/mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result @@ -69,7 +69,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB 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=InnoDB 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter2_2_maria.result b/mysql-test/suite/parts/r/partition_alter2_2_maria.result index 72a497ed964..6dcdfe2d0e5 100644 --- a/mysql-test/suite/parts/r/partition_alter2_2_maria.result +++ b/mysql-test/suite/parts/r/partition_alter2_2_maria.result @@ -74,7 +74,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -541,7 +541,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -1022,15 +1022,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -1514,13 +1514,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -1994,13 +1994,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -2486,20 +2486,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -2981,20 +2981,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -3476,12 +3476,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD @@ -3964,7 +3964,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -4483,7 +4483,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -5016,15 +5016,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -5560,13 +5560,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -6092,13 +6092,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -6636,20 +6636,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -7183,20 +7183,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -7730,12 +7730,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD @@ -8268,7 +8268,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -8787,7 +8787,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -9320,15 +9320,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -9864,13 +9864,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -10396,13 +10396,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -10940,20 +10940,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -11487,20 +11487,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -12034,12 +12034,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD @@ -12575,7 +12575,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -13043,7 +13043,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -13525,15 +13525,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -14018,13 +14018,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -14503,13 +14503,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -14996,20 +14996,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -15496,20 +15496,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -15992,12 +15992,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD @@ -16481,7 +16481,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -17001,7 +17001,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -17535,15 +17535,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -18080,13 +18080,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -18617,13 +18617,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -19162,20 +19162,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -19714,20 +19714,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -20262,12 +20262,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD @@ -20801,7 +20801,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -21321,7 +21321,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -21855,15 +21855,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, - PARTITION part_2 VALUES IN (-2) ENGINE = Aria, - PARTITION part_1 VALUES IN (-1) ENGINE = Aria, - PARTITION part_N VALUES IN (NULL) ENGINE = Aria, - PARTITION part0 VALUES IN (0) ENGINE = Aria, - PARTITION part1 VALUES IN (1) ENGINE = Aria, - PARTITION part2 VALUES IN (2) ENGINE = Aria, - PARTITION part3 VALUES IN (3) ENGINE = Aria) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, + PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, + PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, + PARTITION `part_N` VALUES IN (NULL) ENGINE = Aria, + PARTITION `part0` VALUES IN (0) ENGINE = Aria, + PARTITION `part1` VALUES IN (1) ENGINE = Aria, + PARTITION `part2` VALUES IN (2) ENGINE = Aria, + PARTITION `part3` VALUES IN (3) ENGINE = Aria) unified filelist t1#P#part0.MAD @@ -22400,13 +22400,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, - PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = Aria, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = Aria, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta.MAD @@ -22937,13 +22937,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, - PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = Aria, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = Aria, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = Aria, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = Aria) unified filelist t1#P#parta#SP#partasp0.MAD @@ -23482,20 +23482,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = Aria, - SUBPARTITION subpart12 ENGINE = Aria), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = Aria, - SUBPARTITION subpart22 ENGINE = Aria), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = Aria, - SUBPARTITION subpart32 ENGINE = Aria), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = Aria, - SUBPARTITION subpart42 ENGINE = Aria)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = Aria, + SUBPARTITION `subpart12` ENGINE = Aria), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = Aria, + SUBPARTITION `subpart22` ENGINE = Aria), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = Aria, + SUBPARTITION `subpart32` ENGINE = Aria), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = Aria, + SUBPARTITION `subpart42` ENGINE = Aria)) unified filelist t1#P#part1#SP#subpart11.MAD @@ -24034,20 +24034,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - SUBPARTITION sp12 ENGINE = Aria), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = Aria, - SUBPARTITION sp22 ENGINE = Aria), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = Aria, - SUBPARTITION sp32 ENGINE = Aria), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = Aria, - SUBPARTITION sp42 ENGINE = Aria)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = Aria, + SUBPARTITION `sp12` ENGINE = Aria), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = Aria, + SUBPARTITION `sp22` ENGINE = Aria), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = Aria, + SUBPARTITION `sp32` ENGINE = Aria), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = Aria, + SUBPARTITION `sp42` ENGINE = Aria)) unified filelist t1#P#part1#SP#sp11.MAD @@ -24582,12 +24582,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=Aria 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 = Aria, - PARTITION part2 VALUES IN (1) ENGINE = Aria, - PARTITION part3 VALUES IN (NULL) ENGINE = Aria) +(PARTITION `part1` VALUES IN (0) ENGINE = Aria, + PARTITION `part2` VALUES IN (1) ENGINE = Aria, + PARTITION `part3` VALUES IN (NULL) ENGINE = Aria) unified filelist t1#P#part1#SP#part1sp0.MAD diff --git a/mysql-test/suite/parts/r/partition_alter2_2_myisam.result b/mysql-test/suite/parts/r/partition_alter2_2_myisam.result index aa490308295..5fef45b630d 100644 --- a/mysql-test/suite/parts/r/partition_alter2_2_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter2_2_myisam.result @@ -74,7 +74,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -541,7 +541,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -1022,15 +1022,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -1514,13 +1514,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -1994,13 +1994,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -2486,20 +2486,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -2981,20 +2981,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -3476,12 +3476,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -3964,7 +3964,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -4483,7 +4483,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -5016,15 +5016,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -5560,13 +5560,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -6092,13 +6092,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -6636,20 +6636,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -7183,20 +7183,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -7730,12 +7730,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -8268,7 +8268,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -8787,7 +8787,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -9320,15 +9320,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -9864,13 +9864,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -10396,13 +10396,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -10940,20 +10940,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -11487,20 +11487,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -12034,12 +12034,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -12575,7 +12575,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -13043,7 +13043,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -13525,15 +13525,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -14018,13 +14018,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -14503,13 +14503,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -14996,20 +14996,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -15496,20 +15496,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -15992,12 +15992,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -16481,7 +16481,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -17001,7 +17001,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -17535,15 +17535,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -18080,13 +18080,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -18617,13 +18617,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -19162,20 +19162,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -19714,20 +19714,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -20262,12 +20262,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -20801,7 +20801,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -21321,7 +21321,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -21855,15 +21855,15 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -22400,13 +22400,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -22937,13 +22937,13 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -23482,20 +23482,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -24034,20 +24034,20 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -24582,12 +24582,12 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD diff --git a/mysql-test/suite/parts/r/partition_alter3_innodb.result b/mysql-test/suite/parts/r/partition_alter3_innodb.result index 57c0bc78914..a859f8200c0 100644 --- a/mysql-test/suite/parts/r/partition_alter3_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter3_innodb.result @@ -78,7 +78,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) + PARTITION BY HASH (year(`f_date`)) t1#P#p0.ibd t1.frm t1.par @@ -97,7 +97,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFYEAR(f_date)) + PARTITION BY HASH (dayofyear(`f_date`)) t1#P#p0.ibd t1.frm t1.par @@ -114,7 +114,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) + PARTITION BY HASH (year(`f_date`)) t1#P#p0.ibd t1.frm t1.par @@ -137,10 +137,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB) t1#P#p0.ibd t1#P#part1.ibd t1#P#part7.ibd @@ -163,11 +163,11 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB) t1#P#p0.ibd t1#P#part1.ibd t1#P#part2.ibd @@ -188,15 +188,15 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB, - PARTITION p4 ENGINE = InnoDB, - PARTITION p5 ENGINE = InnoDB, - PARTITION p6 ENGINE = InnoDB, - PARTITION p7 ENGINE = InnoDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB, + PARTITION `p4` ENGINE = InnoDB, + PARTITION `p5` ENGINE = InnoDB, + PARTITION `p6` ENGINE = InnoDB, + PARTITION `p7` ENGINE = InnoDB) t1#P#p0.ibd t1#P#p4.ibd t1#P#p5.ibd @@ -233,14 +233,14 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB, - PARTITION p4 ENGINE = InnoDB, - PARTITION p5 ENGINE = InnoDB, - PARTITION p6 ENGINE = InnoDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB, + PARTITION `p4` ENGINE = InnoDB, + PARTITION `p5` ENGINE = InnoDB, + PARTITION `p6` ENGINE = InnoDB) t1#P#p0.ibd t1#P#p4.ibd t1#P#p5.ibd @@ -263,13 +263,13 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB, - PARTITION p4 ENGINE = InnoDB, - PARTITION p5 ENGINE = InnoDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB, + PARTITION `p4` ENGINE = InnoDB, + PARTITION `p5` ENGINE = InnoDB) t1#P#p0.ibd t1#P#p4.ibd t1#P#p5.ibd @@ -291,12 +291,12 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB, - PARTITION p4 ENGINE = InnoDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB, + PARTITION `p4` ENGINE = InnoDB) t1#P#p0.ibd t1#P#p4.ibd t1#P#part1.ibd @@ -317,11 +317,11 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB) t1#P#p0.ibd t1#P#part1.ibd t1#P#part2.ibd @@ -341,10 +341,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB) t1#P#p0.ibd t1#P#part1.ibd t1#P#part7.ibd @@ -363,9 +363,9 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB) t1#P#p0.ibd t1#P#part1.ibd t1.frm @@ -383,8 +383,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = InnoDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = InnoDB) t1#P#p0.ibd t1.frm t1.par @@ -469,7 +469,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) t1#P#p0.ibd t1.frm t1.par @@ -495,10 +495,10 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB) t1#P#p0.ibd t1#P#part1.ibd t1#P#part7.ibd @@ -521,11 +521,11 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB) t1#P#p0.ibd t1#P#part1.ibd t1#P#part2.ibd @@ -549,15 +549,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB, - PARTITION p4 ENGINE = InnoDB, - PARTITION p5 ENGINE = InnoDB, - PARTITION p6 ENGINE = InnoDB, - PARTITION p7 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB, + PARTITION `p4` ENGINE = InnoDB, + PARTITION `p5` ENGINE = InnoDB, + PARTITION `p6` ENGINE = InnoDB, + PARTITION `p7` ENGINE = InnoDB) t1#P#p0.ibd t1#P#p4.ibd t1#P#p5.ibd @@ -592,14 +592,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB, - PARTITION p4 ENGINE = InnoDB, - PARTITION p5 ENGINE = InnoDB, - PARTITION p6 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB, + PARTITION `p4` ENGINE = InnoDB, + PARTITION `p5` ENGINE = InnoDB, + PARTITION `p6` ENGINE = InnoDB) t1#P#p0.ibd t1#P#p4.ibd t1#P#p5.ibd @@ -625,13 +625,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB, - PARTITION p4 ENGINE = InnoDB, - PARTITION p5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB, + PARTITION `p4` ENGINE = InnoDB, + PARTITION `p5` ENGINE = InnoDB) t1#P#p0.ibd t1#P#p4.ibd t1#P#p5.ibd @@ -656,12 +656,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB, - PARTITION p4 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB, + PARTITION `p4` ENGINE = InnoDB) t1#P#p0.ibd t1#P#p4.ibd t1#P#part1.ibd @@ -685,11 +685,11 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB) t1#P#p0.ibd t1#P#part1.ibd t1#P#part2.ibd @@ -712,10 +712,10 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB, - PARTITION part7 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB, + PARTITION `part7` ENGINE = InnoDB) t1#P#p0.ibd t1#P#part1.ibd t1#P#part7.ibd @@ -737,9 +737,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = InnoDB, - PARTITION part1 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = InnoDB, + PARTITION `part1` ENGINE = InnoDB) t1#P#p0.ibd t1#P#part1.ibd t1.frm @@ -760,8 +760,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = InnoDB) t1#P#p0.ibd t1.frm t1.par diff --git a/mysql-test/suite/parts/r/partition_alter3_myisam.result b/mysql-test/suite/parts/r/partition_alter3_myisam.result index 99d1587ef09..1a412bc27a4 100644 --- a/mysql-test/suite/parts/r/partition_alter3_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result @@ -79,7 +79,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) + PARTITION BY HASH (year(`f_date`)) t1#P#p0.MYD t1#P#p0.MYI t1.frm @@ -99,7 +99,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFYEAR(f_date)) + PARTITION BY HASH (dayofyear(`f_date`)) t1#P#p0.MYD t1#P#p0.MYI t1.frm @@ -117,7 +117,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) + PARTITION BY HASH (year(`f_date`)) t1#P#p0.MYD t1#P#p0.MYI t1.frm @@ -141,10 +141,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#part1.MYD @@ -170,11 +170,11 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#part1.MYD @@ -199,15 +199,15 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM, - PARTITION p4 ENGINE = MyISAM, - PARTITION p5 ENGINE = MyISAM, - PARTITION p6 ENGINE = MyISAM, - PARTITION p7 ENGINE = MyISAM) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM, + PARTITION `p4` ENGINE = MyISAM, + PARTITION `p5` ENGINE = MyISAM, + PARTITION `p6` ENGINE = MyISAM, + PARTITION `p7` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#p4.MYD @@ -252,14 +252,14 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM, - PARTITION p4 ENGINE = MyISAM, - PARTITION p5 ENGINE = MyISAM, - PARTITION p6 ENGINE = MyISAM) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM, + PARTITION `p4` ENGINE = MyISAM, + PARTITION `p5` ENGINE = MyISAM, + PARTITION `p6` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#p4.MYD @@ -289,13 +289,13 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM, - PARTITION p4 ENGINE = MyISAM, - PARTITION p5 ENGINE = MyISAM) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM, + PARTITION `p4` ENGINE = MyISAM, + PARTITION `p5` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#p4.MYD @@ -323,12 +323,12 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM, - PARTITION p4 ENGINE = MyISAM) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM, + PARTITION `p4` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#p4.MYD @@ -354,11 +354,11 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#part1.MYD @@ -382,10 +382,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#part1.MYD @@ -407,9 +407,9 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#part1.MYD @@ -429,8 +429,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = MyISAM) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1.frm @@ -512,7 +512,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) t1#P#p0.MYD t1#P#p0.MYI t1.frm @@ -539,10 +539,10 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#part1.MYD @@ -568,11 +568,11 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#part1.MYD @@ -600,15 +600,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM, - PARTITION p4 ENGINE = MyISAM, - PARTITION p5 ENGINE = MyISAM, - PARTITION p6 ENGINE = MyISAM, - PARTITION p7 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM, + PARTITION `p4` ENGINE = MyISAM, + PARTITION `p5` ENGINE = MyISAM, + PARTITION `p6` ENGINE = MyISAM, + PARTITION `p7` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#p4.MYD @@ -651,14 +651,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM, - PARTITION p4 ENGINE = MyISAM, - PARTITION p5 ENGINE = MyISAM, - PARTITION p6 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM, + PARTITION `p4` ENGINE = MyISAM, + PARTITION `p5` ENGINE = MyISAM, + PARTITION `p6` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#p4.MYD @@ -691,13 +691,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM, - PARTITION p4 ENGINE = MyISAM, - PARTITION p5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM, + PARTITION `p4` ENGINE = MyISAM, + PARTITION `p5` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#p4.MYD @@ -728,12 +728,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM, - PARTITION p4 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM, + PARTITION `p4` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#p4.MYD @@ -762,11 +762,11 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#part1.MYD @@ -793,10 +793,10 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM, - PARTITION part7 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM, + PARTITION `part7` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#part1.MYD @@ -821,9 +821,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = MyISAM, - PARTITION part1 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = MyISAM, + PARTITION `part1` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1#P#part1.MYD @@ -846,8 +846,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p0 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = MyISAM) t1#P#p0.MYD t1#P#p0.MYI t1.frm diff --git a/mysql-test/suite/parts/r/partition_alter4_innodb.result b/mysql-test/suite/parts/r/partition_alter4_innodb.result index 169f73d045a..1c3edcb386d 100644 --- a/mysql-test/suite/parts/r/partition_alter4_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter4_innodb.result @@ -75,9 +75,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = InnoDB, - PARTITION part_2 ENGINE = InnoDB, - PARTITION part_3 ENGINE = InnoDB, - PARTITION part_4 ENGINE = InnoDB, - PARTITION part_5 ENGINE = InnoDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = InnoDB, + PARTITION `part_2` ENGINE = InnoDB, + PARTITION `part_3` ENGINE = InnoDB, + PARTITION `part_4` ENGINE = InnoDB, + PARTITION `part_5` ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = InnoDB) # 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) # 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=InnoDB 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 = InnoDB, - PARTITION part_2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part_3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part_1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part_3` VALUES IN (NULL) ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter4_myisam.result b/mysql-test/suite/parts/r/partition_alter4_myisam.result index a4f7c05345f..326c3bb8a80 100644 --- a/mysql-test/suite/parts/r/partition_alter4_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter4_myisam.result @@ -75,9 +75,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -543,12 +543,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -1028,15 +1028,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -1520,13 +1520,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -2002,13 +2002,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -2494,20 +2494,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -2991,20 +2991,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -3486,12 +3486,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -3973,9 +3973,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -4441,12 +4441,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -4926,15 +4926,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -5418,13 +5418,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -5900,13 +5900,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -6392,20 +6392,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -6889,20 +6889,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -7384,12 +7384,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -7871,9 +7871,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -8339,12 +8339,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -8824,15 +8824,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -9316,13 +9316,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -9798,13 +9798,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -10290,20 +10290,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -10787,20 +10787,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -11282,12 +11282,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -11769,9 +11769,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -12237,12 +12237,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -12722,15 +12722,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -13214,13 +13214,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -13696,13 +13696,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -14188,20 +14188,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -14685,20 +14685,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -15180,12 +15180,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -15667,9 +15667,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -16135,12 +16135,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -16620,15 +16620,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -17112,13 +17112,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -17594,13 +17594,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -18086,20 +18086,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -18583,20 +18583,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -19078,12 +19078,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -19568,9 +19568,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -20036,12 +20036,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -20521,15 +20521,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -21013,13 +21013,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -21495,13 +21495,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -21987,20 +21987,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -22484,20 +22484,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -22979,12 +22979,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -23466,9 +23466,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -23934,12 +23934,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -24419,15 +24419,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -24911,13 +24911,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -25393,13 +25393,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -25885,20 +25885,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -26382,20 +26382,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -26877,12 +26877,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -27364,9 +27364,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -27832,12 +27832,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -28317,15 +28317,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -28809,13 +28809,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -29291,13 +29291,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -29783,20 +29783,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -30280,20 +30280,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -30775,12 +30775,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -31262,9 +31262,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -31730,12 +31730,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -32215,15 +32215,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -32707,13 +32707,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -33189,13 +33189,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -33681,20 +33681,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -34178,20 +34178,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -34673,12 +34673,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -35160,9 +35160,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -35628,12 +35628,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -36113,15 +36113,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -36605,13 +36605,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -37087,13 +37087,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -37579,20 +37579,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -38076,20 +38076,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -38571,12 +38571,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -39061,9 +39061,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -39529,12 +39529,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -40014,15 +40014,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -40506,13 +40506,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -40988,13 +40988,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -41480,20 +41480,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -41977,20 +41977,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -42472,12 +42472,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -42959,9 +42959,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -43427,12 +43427,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -43912,15 +43912,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -44404,13 +44404,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -44886,13 +44886,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -45378,20 +45378,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -45875,20 +45875,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -46370,12 +46370,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -46857,9 +46857,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -47325,12 +47325,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -47810,15 +47810,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -48302,13 +48302,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -48784,13 +48784,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -49276,20 +49276,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -49773,20 +49773,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -50268,12 +50268,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -50755,9 +50755,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -51223,12 +51223,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -51708,15 +51708,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -52200,13 +52200,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -52682,13 +52682,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -53174,20 +53174,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -53671,20 +53671,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -54166,12 +54166,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -54653,9 +54653,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -55121,12 +55121,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -55606,15 +55606,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -56098,13 +56098,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -56580,13 +56580,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -57072,20 +57072,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -57569,20 +57569,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -58064,12 +58064,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -58552,9 +58552,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -59018,12 +59018,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -59501,15 +59501,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -59991,13 +59991,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -60471,13 +60471,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -60961,20 +60961,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -61456,20 +61456,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -61949,12 +61949,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -62434,9 +62434,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -62900,12 +62900,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -63383,15 +63383,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -63873,13 +63873,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -64353,13 +64353,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -64843,20 +64843,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -65338,20 +65338,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -65831,12 +65831,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -66636,9 +66636,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -67102,12 +67102,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -67585,15 +67585,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -68075,13 +68075,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -68555,13 +68555,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -69045,20 +69045,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -69540,20 +69540,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -70033,12 +70033,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -70523,9 +70523,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -70991,12 +70991,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -71476,15 +71476,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -71968,13 +71968,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -72450,13 +72450,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -72942,20 +72942,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -73439,20 +73439,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -73934,12 +73934,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -74421,9 +74421,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -74889,12 +74889,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -75374,15 +75374,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -75866,13 +75866,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -76348,13 +76348,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -76840,20 +76840,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -77337,20 +77337,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -77832,12 +77832,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -78319,9 +78319,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -78787,12 +78787,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -79272,15 +79272,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -79764,13 +79764,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -80246,13 +80246,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -80738,20 +80738,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -81235,20 +81235,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -81730,12 +81730,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -82217,9 +82217,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -82685,12 +82685,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -83170,15 +83170,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -83662,13 +83662,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -84144,13 +84144,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -84636,20 +84636,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -85133,20 +85133,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -85628,12 +85628,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -86115,9 +86115,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -86583,12 +86583,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION part_1 ENGINE = MyISAM, - PARTITION part_2 ENGINE = MyISAM, - PARTITION part_3 ENGINE = MyISAM, - PARTITION part_4 ENGINE = MyISAM, - PARTITION part_5 ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `part_1` ENGINE = MyISAM, + PARTITION `part_2` ENGINE = MyISAM, + PARTITION `part_3` ENGINE = MyISAM, + PARTITION `part_4` ENGINE = MyISAM, + PARTITION `part_5` ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -87068,15 +87068,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -87560,13 +87560,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_1` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `part_5` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1.MYD @@ -88042,13 +88042,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part_1` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `part_3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part_4` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD @@ -88534,20 +88534,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part_1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part_2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part_3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part_4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part_1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part_2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part_3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part_4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#subpart11.MYD @@ -89031,20 +89031,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part_2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part_3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part_4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part_1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part_2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part_3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part_4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part_1#SP#sp11.MYD @@ -89526,12 +89526,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part_1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part_3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part_1#SP#part_1sp0.MYD diff --git a/mysql-test/suite/parts/r/partition_auto_increment_archive.result b/mysql-test/suite/parts/r/partition_auto_increment_archive.result index 7497e7d9cea..b600b45e8ef 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_archive.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_archive.result @@ -135,7 +135,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -341,7 +341,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=27 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -365,7 +365,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=28 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -394,7 +394,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; # Test with two threads @@ -646,7 +646,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (4); # ERROR (only OK if Archive) mysql_errno: 1022 @@ -656,7 +656,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -665,7 +665,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -674,7 +674,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -689,7 +689,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); # ERROR (only OK if Archive) mysql_errno: 1022 @@ -699,7 +699,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -708,7 +708,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=302 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -729,7 +729,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -738,7 +738,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -750,7 +750,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -759,7 +759,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=24 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SET INSERT_ID = 22; INSERT INTO t1 VALUES (NULL), (NULL), (NULL); @@ -784,7 +784,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 FLUSH TABLE; SHOW CREATE TABLE t1; @@ -793,7 +793,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (4); FLUSH TABLE; @@ -803,7 +803,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (NULL); FLUSH TABLE; @@ -813,7 +813,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=ARCHIVE AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result index 639748e7977..0276385dc29 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result @@ -166,7 +166,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -324,7 +324,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=27 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -336,7 +336,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -352,7 +352,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; # Test with two threads @@ -534,7 +534,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (4); SHOW CREATE TABLE t1; @@ -543,7 +543,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -552,7 +552,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -561,7 +561,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=7 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -574,7 +574,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -583,7 +583,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -592,7 +592,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=302 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -609,7 +609,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -618,7 +618,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -629,7 +629,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -638,7 +638,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE AUTO_INCREMENT=24 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SET INSERT_ID = 22; INSERT INTO t1 VALUES (NULL), (NULL), (NULL); @@ -661,7 +661,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 FLUSH TABLE; SHOW CREATE TABLE t1; @@ -670,7 +670,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (4); FLUSH TABLE; @@ -680,7 +680,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (NULL); FLUSH TABLE; @@ -690,7 +690,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result index a6af2b924c0..6250f28eb00 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result @@ -186,7 +186,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -410,7 +410,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -423,7 +423,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -441,7 +441,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; # Test with two threads @@ -701,7 +701,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (4); SHOW CREATE TABLE t1; @@ -710,7 +710,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -719,7 +719,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -728,7 +728,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -744,7 +744,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -753,7 +753,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -762,7 +762,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=302 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -785,7 +785,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -794,7 +794,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -806,7 +806,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -815,7 +815,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SET INSERT_ID = 22; INSERT INTO t1 VALUES (NULL), (NULL), (NULL); @@ -839,7 +839,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 FLUSH TABLE; SHOW CREATE TABLE t1; @@ -848,7 +848,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (4); FLUSH TABLE; @@ -858,7 +858,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (NULL); FLUSH TABLE; @@ -868,7 +868,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_maria.result b/mysql-test/suite/parts/r/partition_auto_increment_maria.result index 6fdbdeb2653..5acce3e9492 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_maria.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_maria.result @@ -186,7 +186,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -410,7 +410,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=27 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -423,7 +423,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=28 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -440,7 +440,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=102 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; # Test with two threads @@ -747,7 +747,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (4); SHOW CREATE TABLE t1; @@ -756,7 +756,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -765,7 +765,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -774,7 +774,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -790,7 +790,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -799,7 +799,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -808,7 +808,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=302 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -831,7 +831,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -840,7 +840,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -852,7 +852,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -861,7 +861,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=24 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SET INSERT_ID = 22; INSERT INTO t1 VALUES (NULL), (NULL), (NULL); @@ -886,7 +886,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 FLUSH TABLE; SHOW CREATE TABLE t1; @@ -895,7 +895,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (4); FLUSH TABLE; @@ -905,7 +905,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (NULL); FLUSH TABLE; @@ -915,7 +915,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=Aria AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_memory.result b/mysql-test/suite/parts/r/partition_auto_increment_memory.result index 62ab0c1ca51..e622ddaa259 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_memory.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_memory.result @@ -186,7 +186,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -410,7 +410,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=27 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -423,7 +423,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -440,7 +440,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=102 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; # Test with two threads @@ -728,7 +728,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (4); SHOW CREATE TABLE t1; @@ -737,7 +737,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -746,7 +746,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -755,7 +755,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -771,7 +771,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -780,7 +780,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -789,7 +789,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=302 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -812,7 +812,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -821,7 +821,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -833,7 +833,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -842,7 +842,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=24 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SET INSERT_ID = 22; INSERT INTO t1 VALUES (NULL), (NULL), (NULL); @@ -867,7 +867,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 FLUSH TABLE; SHOW CREATE TABLE t1; @@ -876,7 +876,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (4); FLUSH TABLE; @@ -886,7 +886,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (NULL); FLUSH TABLE; @@ -896,7 +896,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MEMORY AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_myisam.result b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result index 27cf857abb0..4e67094b327 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_myisam.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result @@ -186,7 +186,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -410,7 +410,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=27 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -423,7 +423,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -440,7 +440,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=102 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; # Test with two threads @@ -747,7 +747,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (4); SHOW CREATE TABLE t1; @@ -756,7 +756,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -765,7 +765,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -774,7 +774,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -790,7 +790,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -799,7 +799,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -808,7 +808,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=302 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -831,7 +831,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -840,7 +840,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -852,7 +852,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -861,7 +861,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=24 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SET INSERT_ID = 22; INSERT INTO t1 VALUES (NULL), (NULL), (NULL); @@ -886,7 +886,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 FLUSH TABLE; SHOW CREATE TABLE t1; @@ -895,7 +895,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (4); FLUSH TABLE; @@ -905,7 +905,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (NULL); FLUSH TABLE; @@ -915,7 +915,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_basic_innodb.result b/mysql-test/suite/parts/r/partition_basic_innodb.result index d8872e16d5e..edaeefe45b3 100644 --- a/mysql-test/suite/parts/r/partition_basic_innodb.result +++ b/mysql-test/suite/parts/r/partition_basic_innodb.result @@ -73,7 +73,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -530,7 +530,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -998,15 +998,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) unified filelist t1#P#part0.ibd @@ -1474,13 +1474,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta.ibd @@ -1942,13 +1942,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta#SP#partasp0.ibd @@ -2418,20 +2418,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#subpart11.ibd @@ -2903,20 +2903,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#sp11.ibd @@ -3382,12 +3382,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) unified filelist t1#P#part1#SP#part1sp0.ibd @@ -3852,7 +3852,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -4309,7 +4309,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -4777,15 +4777,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) unified filelist t1#P#part0.ibd @@ -5253,13 +5253,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta.ibd @@ -5721,13 +5721,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta#SP#partasp0.ibd @@ -6195,20 +6195,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#subpart11.ibd @@ -6676,20 +6676,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#sp11.ibd @@ -7155,12 +7155,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) unified filelist t1#P#part1#SP#part1sp0.ibd @@ -7631,7 +7631,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -8125,7 +8125,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -8630,15 +8630,15 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) unified filelist t1#P#part0.ibd @@ -9143,13 +9143,13 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta.ibd @@ -9648,13 +9648,13 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta#SP#partasp0.ibd @@ -10161,20 +10161,20 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#subpart11.ibd @@ -10683,20 +10683,20 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#sp11.ibd @@ -11199,12 +11199,12 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) unified filelist t1#P#part1#SP#part1sp0.ibd @@ -11705,7 +11705,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -12199,7 +12199,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -12704,15 +12704,15 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) unified filelist t1#P#part0.ibd @@ -13217,13 +13217,13 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta.ibd @@ -13722,13 +13722,13 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta#SP#partasp0.ibd @@ -14235,20 +14235,20 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#subpart11.ibd @@ -14757,20 +14757,20 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#sp11.ibd @@ -15273,12 +15273,12 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) unified filelist t1#P#part1#SP#part1sp0.ibd @@ -15779,7 +15779,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -16289,7 +16289,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -16810,15 +16810,15 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) unified filelist t1#P#part0.ibd @@ -17339,13 +17339,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta.ibd @@ -17860,13 +17860,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta#SP#partasp0.ibd @@ -18389,20 +18389,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#subpart11.ibd @@ -18927,20 +18927,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#sp11.ibd @@ -19459,12 +19459,12 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) unified filelist t1#P#part1#SP#part1sp0.ibd @@ -19986,7 +19986,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -20480,7 +20480,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -20985,15 +20985,15 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) unified filelist t1#P#part0.ibd @@ -21498,13 +21498,13 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta.ibd @@ -22003,13 +22003,13 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta#SP#partasp0.ibd @@ -22514,20 +22514,20 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#subpart11.ibd @@ -23032,20 +23032,20 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#sp11.ibd @@ -23548,12 +23548,12 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) unified filelist t1#P#part1#SP#part1sp0.ibd @@ -24054,7 +24054,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -24548,7 +24548,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -25053,15 +25053,15 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) unified filelist t1#P#part0.ibd @@ -25566,13 +25566,13 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta.ibd @@ -26071,13 +26071,13 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta#SP#partasp0.ibd @@ -26582,20 +26582,20 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#subpart11.ibd @@ -27100,20 +27100,20 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#sp11.ibd @@ -27616,12 +27616,12 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) unified filelist t1#P#part1#SP#part1sp0.ibd @@ -28122,7 +28122,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -28632,7 +28632,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -29153,15 +29153,15 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, - PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, - PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, - PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part0 VALUES IN (0) ENGINE = InnoDB, - PARTITION part1 VALUES IN (1) ENGINE = InnoDB, - PARTITION part2 VALUES IN (2) ENGINE = InnoDB, - PARTITION part3 VALUES IN (3) ENGINE = InnoDB) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, + PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, + PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, + PARTITION `part_N` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part0` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part1` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (2) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (3) ENGINE = InnoDB) unified filelist t1#P#part0.ibd @@ -29682,13 +29682,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, - PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = InnoDB, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta.ibd @@ -30203,13 +30203,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, - PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = InnoDB, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = InnoDB, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = InnoDB) unified filelist t1#P#parta#SP#partasp0.ibd @@ -30730,20 +30730,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = InnoDB, - SUBPARTITION subpart42 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = InnoDB, + SUBPARTITION `subpart42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#subpart11.ibd @@ -31264,20 +31264,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - SUBPARTITION sp12 ENGINE = InnoDB), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = InnoDB, - SUBPARTITION sp22 ENGINE = InnoDB), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = InnoDB, - SUBPARTITION sp32 ENGINE = InnoDB), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = InnoDB, - SUBPARTITION sp42 ENGINE = InnoDB)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = InnoDB, + SUBPARTITION `sp12` ENGINE = InnoDB), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = InnoDB, + SUBPARTITION `sp22` ENGINE = InnoDB), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = InnoDB, + SUBPARTITION `sp32` ENGINE = InnoDB), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = InnoDB, + SUBPARTITION `sp42` ENGINE = InnoDB)) unified filelist t1#P#part1#SP#sp11.ibd @@ -31796,12 +31796,12 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=InnoDB 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 = InnoDB, - PARTITION part2 VALUES IN (1) ENGINE = InnoDB, - PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) +(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (1) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (NULL) ENGINE = InnoDB) unified filelist t1#P#part1#SP#part1sp0.ibd diff --git a/mysql-test/suite/parts/r/partition_basic_myisam.result b/mysql-test/suite/parts/r/partition_basic_myisam.result index 69799a07076..e32cd4394ad 100644 --- a/mysql-test/suite/parts/r/partition_basic_myisam.result +++ b/mysql-test/suite/parts/r/partition_basic_myisam.result @@ -73,7 +73,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -533,7 +533,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -1007,15 +1007,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -1492,13 +1492,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -1967,13 +1967,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -2452,20 +2452,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -2946,20 +2946,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -3434,12 +3434,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -3914,7 +3914,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -4374,7 +4374,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -4848,15 +4848,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -5333,13 +5333,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -5808,13 +5808,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -6291,20 +6291,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -6781,20 +6781,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -7269,12 +7269,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -7755,7 +7755,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -8268,7 +8268,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) + PARTITION BY KEY (`f_int1`) PARTITIONS 5 unified filelist @@ -8795,15 +8795,15 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -9333,13 +9333,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -9861,13 +9861,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -10399,20 +10399,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -10946,20 +10946,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -11487,12 +11487,12 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -12024,7 +12024,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) + PARTITION BY HASH (`f_int1` + `f_int2`) PARTITIONS 2 unified filelist @@ -12537,7 +12537,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) + PARTITION BY KEY (`f_int1`,`f_int2`) PARTITIONS 5 unified filelist @@ -13064,15 +13064,15 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -13602,13 +13602,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -14130,13 +14130,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -14666,20 +14666,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -15209,20 +15209,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - SUBPARTITION sp12 ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MyISAM, - SUBPARTITION sp22 ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MyISAM, - SUBPARTITION sp32 ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MyISAM, - SUBPARTITION sp42 ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` ENGINE = MyISAM, + SUBPARTITION `sp12` ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` ENGINE = MyISAM, + SUBPARTITION `sp22` ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` ENGINE = MyISAM, + SUBPARTITION `sp32` ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` ENGINE = MyISAM, + SUBPARTITION `sp42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -15750,12 +15750,12 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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 = MyISAM, - PARTITION part2 VALUES IN (1) ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD diff --git a/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result b/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result index f1c2a7d9af4..4d3fae27422 100644 --- a/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result +++ b/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result @@ -70,9 +70,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) -(PARTITION p0 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB, - PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB) + PARTITION BY HASH (`c1`) +(PARTITION `p0` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB, + PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB) # # Verify that the DATA/INDEX DIRECTORY is stored and used if we # ALTER TABLE to MyISAM. @@ -83,9 +83,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) -(PARTITION p0 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, - PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM) + PARTITION BY HASH (`c1`) +(PARTITION `p0` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, + PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM) # Verifying .frm, .par and MyISAM files (.MYD, MYI) ---- MYSQLD_DATADIR/test t1#P#p0.MYD @@ -110,9 +110,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) -(PARTITION p0 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB, - PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB) + PARTITION BY HASH (`c1`) +(PARTITION `p0` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB, + PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB) # Verifying .frm, .par, .isl and InnoDB .ibd files ---- MYSQLD_DATADIR/test t1#P#p0.isl diff --git a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result index 89ebd5652e7..51e6f282ad0 100644 --- a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result +++ b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result @@ -83,9 +83,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#p1.MYD @@ -563,12 +563,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p3` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p4` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p5` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#p1.MYD @@ -1059,15 +1059,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -1572,13 +1572,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -2067,13 +2067,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -2572,20 +2572,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart12` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart22` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart42` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -3102,20 +3102,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (ABS(MOD(f_int1,3))) -SUBPARTITION BY HASH (f_int1 + 1) -(PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp12` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp22` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp42` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -3612,12 +3612,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -4116,9 +4116,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) -(PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY HASH (`f_int1` + `f_int2`) +(PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#p1.MYD @@ -4596,12 +4596,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) -(PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`,`f_int2`) +(PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p3` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p4` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p5` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#p1.MYD @@ -5092,15 +5092,15 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -5605,13 +5605,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -6100,13 +6100,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -6603,20 +6603,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart12` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart22` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart42` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -7133,20 +7133,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (ABS(MOD(f_int1,3))) -SUBPARTITION BY HASH (f_int2 + 1) -(PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp12` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp22` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp42` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -7643,12 +7643,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM 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) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -8153,9 +8153,9 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#p1.MYD @@ -8686,12 +8686,12 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1) -(PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`) +(PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p3` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p4` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p5` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#p1.MYD @@ -9235,15 +9235,15 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -9801,13 +9801,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -10349,13 +10349,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -10907,20 +10907,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart12` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart22` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart42` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -11490,20 +11490,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (ABS(MOD(f_int1,3))) -SUBPARTITION BY HASH (f_int1 + 1) -(PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp12` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp22` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp42` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -12053,12 +12053,12 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -12614,9 +12614,9 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1 + f_int2) -(PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY HASH (`f_int1` + `f_int2`) +(PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#p1.MYD @@ -13147,12 +13147,12 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (f_int1,f_int2) -(PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY KEY (`f_int1`,`f_int2`) +(PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p3` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p4` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p5` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#p1.MYD @@ -13696,15 +13696,15 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) +(PARTITION `part_3` VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -14262,13 +14262,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2) +(PARTITION `parta` VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -14810,13 +14810,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -15366,20 +15366,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int2) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int2`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart12` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart22` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart42` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -15949,20 +15949,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (ABS(MOD(f_int1,3))) -SUBPARTITION BY HASH (f_int2 + 1) -(PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int2` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp12` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp22` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp42` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD @@ -16512,12 +16512,12 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) +(PARTITION `part1` VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part2` VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part3` VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -17069,9 +17069,9 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION p1 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p2 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `p1` INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p2` INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#p1.MYD @@ -17595,12 +17595,12 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, - PARTITION p2 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION p4 ENGINE = MyISAM, - PARTITION p5 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, + PARTITION `p2` INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p3` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `p4` ENGINE = MyISAM, + PARTITION `p5` INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#p1.MYD @@ -18139,15 +18139,15 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, - PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, - PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION part1 VALUES IN (1) ENGINE = MyISAM, - PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, - PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 4) +(PARTITION `part_3` VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_2` VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, + PARTITION `part_1` VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part_N` VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, + PARTITION `part0` VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `part1` VALUES IN (1) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, + PARTITION `part3` VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#part0.MYD @@ -18692,13 +18692,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, - PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, - PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) + PARTITION BY RANGE (`f_int1`) +(PARTITION `parta` VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (15) ENGINE = MyISAM, + PARTITION `parte` VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, + PARTITION `partf` VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#parta.MYD @@ -19230,13 +19230,13 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM 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) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, - PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) +(PARTITION `parta` VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + PARTITION `partb` VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, + PARTITION `partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `partd` VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) unified filelist t1#P#parta#SP#partasp0.MYD @@ -19781,20 +19781,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY KEY (f_int1) -(PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, - SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MyISAM, - SUBPARTITION subpart42 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY KEY (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (0) + (SUBPARTITION `subpart11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, + SUBPARTITION `subpart12` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (5) + (SUBPARTITION `subpart21` INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart22` INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (10) + (SUBPARTITION `subpart31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `subpart32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part4` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart41` ENGINE = MyISAM, + SUBPARTITION `subpart42` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -20324,20 +20324,20 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (ABS(MOD(f_int1,3))) -SUBPARTITION BY HASH (f_int1 + 1) -(PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, - SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), - PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, - SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) + PARTITION BY LIST (abs(`f_int1` % 3)) +SUBPARTITION BY HASH (`f_int1` + 1) +(PARTITION `part1` VALUES IN (0) + (SUBPARTITION `sp11` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp12` INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part2` VALUES IN (1) + (SUBPARTITION `sp21` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, + SUBPARTITION `sp22` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part3` VALUES IN (2) + (SUBPARTITION `sp31` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp32` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), + PARTITION `part4` VALUES IN (NULL) + (SUBPARTITION `sp41` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, + SUBPARTITION `sp42` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) unified filelist t1#P#part1#SP#sp11.MYD diff --git a/mysql-test/suite/parts/r/partition_bigint_innodb.result b/mysql-test/suite/parts/r/partition_bigint_innodb.result index c11e72d85d3..1891625d942 100644 --- a/mysql-test/suite/parts/r/partition_bigint_innodb.result +++ b/mysql-test/suite/parts/r/partition_bigint_innodb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612), (1), (2), (65535); select * from t1; a @@ -58,7 +58,7 @@ t2 CREATE TABLE `t2` ( `a` bigint(20) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612); select * from t2; @@ -90,7 +90,7 @@ t3 CREATE TABLE `t3` ( `a` bigint(20) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (9223372036854775807), (9223372036854775806), (9223372036854775805), (9223372036854775804), (-9223372036854775808), (-9223372036854775807), (1), (-1), (0); select * from t3; diff --git a/mysql-test/suite/parts/r/partition_bigint_myisam.result b/mysql-test/suite/parts/r/partition_bigint_myisam.result index 6407fdf23d6..38a22164733 100644 --- a/mysql-test/suite/parts/r/partition_bigint_myisam.result +++ b/mysql-test/suite/parts/r/partition_bigint_myisam.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612), (1), (2), (65535); select * from t1; a @@ -58,7 +58,7 @@ t2 CREATE TABLE `t2` ( `a` bigint(20) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612); select * from t2; @@ -90,7 +90,7 @@ t3 CREATE TABLE `t3` ( `a` bigint(20) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (9223372036854775807), (9223372036854775806), (9223372036854775805), (9223372036854775804), (-9223372036854775808), (-9223372036854775807), (1), (-1), (0); select * from t3; diff --git a/mysql-test/suite/parts/r/partition_bit_innodb.result b/mysql-test/suite/parts/r/partition_bit_innodb.result index 187b4a13d05..b3bf1dac15e 100644 --- a/mysql-test/suite/parts/r/partition_bit_innodb.result +++ b/mysql-test/suite/parts/r/partition_bit_innodb.result @@ -9,7 +9,7 @@ t1 CREATE TABLE `t1` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) drop table t1; create table t1 (a bit(0), primary key (a)) engine='INNODB' partition by key (a) ( @@ -21,9 +21,9 @@ t1 CREATE TABLE `t1` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 ENGINE = InnoDB, - PARTITION pa2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` ENGINE = InnoDB, + PARTITION `pa2` ENGINE = InnoDB) drop table t1; create table t1 (a bit(64), primary key (a)) engine='INNODB' partition by key (a) partitions 2; @@ -33,7 +33,7 @@ t1 CREATE TABLE `t1` ( `a` bit(64) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 2 insert into t1 values (b'1111111111111111111111111111111111111111111111111111111111111111'), @@ -61,11 +61,11 @@ t1 CREATE TABLE `t1` ( `a` bit(64) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values (b'1111111111111111111111111111111111111111111111111111111111111111'), (b'1000000000000000000000000000000000000000000000000000000000000000'), @@ -91,7 +91,7 @@ t2 CREATE TABLE `t2` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 4 insert into t2 values (b'0'), (b'1'); select hex(a) from t2; @@ -104,7 +104,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `a` bit(1) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 4 select hex(a) from t2; hex(a) @@ -117,7 +117,7 @@ t2 CREATE TABLE `t2` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 4 select hex(a) from t2; hex(a) @@ -136,13 +136,13 @@ t3 CREATE TABLE `t3` ( `a` bit(8) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (`a`) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES LESS THAN (3) ENGINE = InnoDB, - PARTITION pa2 VALUES LESS THAN (16) ENGINE = InnoDB, - PARTITION pa3 VALUES LESS THAN (64) ENGINE = InnoDB, - PARTITION pa4 VALUES LESS THAN (256) ENGINE = InnoDB) +(PARTITION `pa1` VALUES LESS THAN (3) ENGINE = InnoDB, + PARTITION `pa2` VALUES LESS THAN (16) ENGINE = InnoDB, + PARTITION `pa3` VALUES LESS THAN (64) ENGINE = InnoDB, + PARTITION `pa4` VALUES LESS THAN (256) ENGINE = InnoDB) 255 inserts; select hex(a) from t3 where a=b'01010101'; hex(a) @@ -419,12 +419,12 @@ t4 CREATE TABLE `t4` ( `a` bit(8) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (`a`) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES IN (0,1,2,3) ENGINE = InnoDB, - PARTITION pa2 VALUES IN (4,5,6,7,8,9,10,11,12,13,14,15,16) ENGINE = InnoDB, - PARTITION pa3 VALUES IN (17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32) ENGINE = InnoDB) +(PARTITION `pa1` VALUES IN (0,1,2,3) ENGINE = InnoDB, + PARTITION `pa2` VALUES IN (4,5,6,7,8,9,10,11,12,13,14,15,16) ENGINE = InnoDB, + PARTITION `pa3` VALUES IN (17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32) ENGINE = InnoDB) 32 inserts; select hex(a) from t4 where a=b'00000001'; hex(a) diff --git a/mysql-test/suite/parts/r/partition_bit_myisam.result b/mysql-test/suite/parts/r/partition_bit_myisam.result index 3530743893e..6e25ea5a8d9 100644 --- a/mysql-test/suite/parts/r/partition_bit_myisam.result +++ b/mysql-test/suite/parts/r/partition_bit_myisam.result @@ -9,7 +9,7 @@ t1 CREATE TABLE `t1` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) drop table t1; create table t1 (a bit(0), primary key (a)) engine='MyISAM' partition by key (a) ( @@ -21,9 +21,9 @@ t1 CREATE TABLE `t1` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 ENGINE = MyISAM, - PARTITION pa2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` ENGINE = MyISAM, + PARTITION `pa2` ENGINE = MyISAM) drop table t1; create table t1 (a bit(64), primary key (a)) engine='MyISAM' partition by key (a) partitions 2; @@ -33,7 +33,7 @@ t1 CREATE TABLE `t1` ( `a` bit(64) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 2 insert into t1 values (b'1111111111111111111111111111111111111111111111111111111111111111'), @@ -61,11 +61,11 @@ t1 CREATE TABLE `t1` ( `a` bit(64) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values (b'1111111111111111111111111111111111111111111111111111111111111111'), (b'1000000000000000000000000000000000000000000000000000000000000000'), @@ -91,7 +91,7 @@ t2 CREATE TABLE `t2` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 4 insert into t2 values (b'0'), (b'1'); select hex(a) from t2; @@ -104,7 +104,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `a` bit(1) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 4 select hex(a) from t2; hex(a) @@ -117,7 +117,7 @@ t2 CREATE TABLE `t2` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 4 select hex(a) from t2; hex(a) @@ -136,13 +136,13 @@ t3 CREATE TABLE `t3` ( `a` bit(8) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (`a`) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES LESS THAN (3) ENGINE = MyISAM, - PARTITION pa2 VALUES LESS THAN (16) ENGINE = MyISAM, - PARTITION pa3 VALUES LESS THAN (64) ENGINE = MyISAM, - PARTITION pa4 VALUES LESS THAN (256) ENGINE = MyISAM) +(PARTITION `pa1` VALUES LESS THAN (3) ENGINE = MyISAM, + PARTITION `pa2` VALUES LESS THAN (16) ENGINE = MyISAM, + PARTITION `pa3` VALUES LESS THAN (64) ENGINE = MyISAM, + PARTITION `pa4` VALUES LESS THAN (256) ENGINE = MyISAM) 255 inserts; select hex(a) from t3 where a=b'01010101'; hex(a) @@ -419,12 +419,12 @@ t4 CREATE TABLE `t4` ( `a` bit(8) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (`a`) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES IN (0,1,2,3) ENGINE = MyISAM, - PARTITION pa2 VALUES IN (4,5,6,7,8,9,10,11,12,13,14,15,16) ENGINE = MyISAM, - PARTITION pa3 VALUES IN (17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32) ENGINE = MyISAM) +(PARTITION `pa1` VALUES IN (0,1,2,3) ENGINE = MyISAM, + PARTITION `pa2` VALUES IN (4,5,6,7,8,9,10,11,12,13,14,15,16) ENGINE = MyISAM, + PARTITION `pa3` VALUES IN (17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32) ENGINE = MyISAM) 32 inserts; select hex(a) from t4 where a=b'00000001'; hex(a) diff --git a/mysql-test/suite/parts/r/partition_char_innodb.result b/mysql-test/suite/parts/r/partition_char_innodb.result index ab961222a6636cd24e1ceaa8533b794a21d6e374..d31229a1cb3875212d8cc82581d14de909f1e6d8 100644 GIT binary patch delta 441 zcmaFV&b+FFdBagg(S*bVO)iZ9$Dk0;5Kn(Ug@l4c!-UC&f)=bmmQliFK_)QEIAQX~ zO<5YG@#e?NtSM8nCAf)>mLiAIwhqd~MWkd~V4zgZ5* zHrYIpX$vc3;^c&krIR19IZi&n!oS&;Q=fx0QzlPj>fC%#h*Jn`lE-FI)mx?{o8Z5h zD<+tSF>!N3Mz<7My8XE)hd266?qlbkyrzF6$fOBZNH@u4v&$MTW}xoC^`XopyTfJk Nw$1S%-4fe{cmZL*finOA diff --git a/mysql-test/suite/parts/r/partition_char_myisam.result b/mysql-test/suite/parts/r/partition_char_myisam.result index 09b77cad211d8a2856a11871137574b589ff82ff..eb9342ba2bc95c74a9825d5051020e40fcec72df 100644 GIT binary patch delta 441 zcmaFV&b+FFdBagg(S*bVO)iZ9$Dk0;5Kn(Ug@l4c!-UC&f)=bmmQliFK_)QEIAQX~ zO<5YG@#e?NtSM8nCAf)>mLiAIwhqd~MWkd~V4zgZ5* zHrYIpX$vc3;^c&krIR19IZi&n!oS&;Q=fx0QzlPj>fC%#h*Jn`lE-FI)mx?{o8Z5h zD<+tSF>!N3Mz<7My8XE)hd266?qlbkyrzF6$fOBZNH@u4v&$MTW}xoC^`XopyTfJk Nw$1S%-4fe{cmZL*finOA diff --git a/mysql-test/suite/parts/r/partition_datetime_innodb.result b/mysql-test/suite/parts/r/partition_datetime_innodb.result index 0c7b47edcda..883f2bb1924 100644 --- a/mysql-test/suite/parts/r/partition_datetime_innodb.result +++ b/mysql-test/suite/parts/r/partition_datetime_innodb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59'); select * from t1; a @@ -40,7 +40,7 @@ t2 CREATE TABLE `t2` ( `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16'); select * from t2; @@ -137,11 +137,11 @@ t1 CREATE TABLE `t1` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15'); select * from t1; a @@ -167,7 +167,7 @@ t2 CREATE TABLE `t2` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15'); select * from t2; @@ -291,13 +291,13 @@ t3 CREATE TABLE `t3` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES LESS THAN (4) ENGINE = InnoDB, - PARTITION quarter2 VALUES LESS THAN (7) ENGINE = InnoDB, - PARTITION quarter3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION quarter4 VALUES LESS THAN (13) ENGINE = InnoDB) +(PARTITION `quarter1` VALUES LESS THAN (4) ENGINE = InnoDB, + PARTITION `quarter2` VALUES LESS THAN (7) ENGINE = InnoDB, + PARTITION `quarter3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `quarter4` VALUES LESS THAN (13) ENGINE = InnoDB) 12 inserts; select count(*) from t3; count(*) @@ -331,13 +331,13 @@ t4 CREATE TABLE `t4` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES IN (1,2,3) ENGINE = InnoDB, - PARTITION quarter2 VALUES IN (4,5,6) ENGINE = InnoDB, - PARTITION quarter3 VALUES IN (7,8,9) ENGINE = InnoDB, - PARTITION quarter4 VALUES IN (10,11,12) ENGINE = InnoDB) +(PARTITION `quarter1` VALUES IN (1,2,3) ENGINE = InnoDB, + PARTITION `quarter2` VALUES IN (4,5,6) ENGINE = InnoDB, + PARTITION `quarter3` VALUES IN (7,8,9) ENGINE = InnoDB, + PARTITION `quarter4` VALUES IN (10,11,12) ENGINE = InnoDB) 12 inserts; select count(*) from t4; count(*) @@ -369,11 +369,11 @@ t1 CREATE TABLE `t1` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values ('21:21:21'), ('12:10:30'), ('03:03:03'), ('23:59'); select * from t1; a @@ -399,7 +399,7 @@ t2 CREATE TABLE `t2` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('0:1:1'), ('10:11:12'), ('13:14:15'), ('14:15:16'); select * from t2; @@ -498,13 +498,13 @@ t3 CREATE TABLE `t3` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (second(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (second(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES LESS THAN (16) ENGINE = InnoDB, - PARTITION quarter2 VALUES LESS THAN (31) ENGINE = InnoDB, - PARTITION quarter3 VALUES LESS THAN (46) ENGINE = InnoDB, - PARTITION quarter4 VALUES LESS THAN (61) ENGINE = InnoDB) +(PARTITION `quarter1` VALUES LESS THAN (16) ENGINE = InnoDB, + PARTITION `quarter2` VALUES LESS THAN (31) ENGINE = InnoDB, + PARTITION `quarter3` VALUES LESS THAN (46) ENGINE = InnoDB, + PARTITION `quarter4` VALUES LESS THAN (61) ENGINE = InnoDB) 59 inserts; select count(*) from t3; count(*) @@ -585,13 +585,13 @@ t4 CREATE TABLE `t4` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (second(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (second(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES IN (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ENGINE = InnoDB, - PARTITION quarter2 VALUES IN (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, - PARTITION quarter3 VALUES IN (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45) ENGINE = InnoDB, - PARTITION quarter4 VALUES IN (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) +(PARTITION `quarter1` VALUES IN (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ENGINE = InnoDB, + PARTITION `quarter2` VALUES IN (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB, + PARTITION `quarter3` VALUES IN (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45) ENGINE = InnoDB, + PARTITION `quarter4` VALUES IN (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) 59 inserts; select count(*) from t4; count(*) @@ -670,11 +670,11 @@ t1 CREATE TABLE `t1` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59'); select * from t1; a @@ -700,7 +700,7 @@ t2 CREATE TABLE `t2` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16'); select * from t2; @@ -799,13 +799,13 @@ t3 CREATE TABLE `t3` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES LESS THAN (4) ENGINE = InnoDB, - PARTITION quarter2 VALUES LESS THAN (7) ENGINE = InnoDB, - PARTITION quarter3 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION quarter4 VALUES LESS THAN (13) ENGINE = InnoDB) +(PARTITION `quarter1` VALUES LESS THAN (4) ENGINE = InnoDB, + PARTITION `quarter2` VALUES LESS THAN (7) ENGINE = InnoDB, + PARTITION `quarter3` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `quarter4` VALUES LESS THAN (13) ENGINE = InnoDB) 12 inserts; select count(*) from t3; count(*) @@ -839,13 +839,13 @@ t4 CREATE TABLE `t4` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES IN (1,2,3) ENGINE = InnoDB, - PARTITION quarter2 VALUES IN (4,5,6) ENGINE = InnoDB, - PARTITION quarter3 VALUES IN (7,8,9) ENGINE = InnoDB, - PARTITION quarter4 VALUES IN (10,11,12) ENGINE = InnoDB) +(PARTITION `quarter1` VALUES IN (1,2,3) ENGINE = InnoDB, + PARTITION `quarter2` VALUES IN (4,5,6) ENGINE = InnoDB, + PARTITION `quarter3` VALUES IN (7,8,9) ENGINE = InnoDB, + PARTITION `quarter4` VALUES IN (10,11,12) ENGINE = InnoDB) 12 inserts; select count(*) from t4; count(*) @@ -877,11 +877,11 @@ t1 CREATE TABLE `t1` ( `a` year(4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values ('1975'), (2020), ('1980'), ('2000'); select * from t1; a @@ -907,7 +907,7 @@ t2 CREATE TABLE `t2` ( `a` year(4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975'), ('2020'), ('1980'), ('2000'); select * from t2; diff --git a/mysql-test/suite/parts/r/partition_datetime_myisam.result b/mysql-test/suite/parts/r/partition_datetime_myisam.result index 40efba9d984..34e06b1ba30 100644 --- a/mysql-test/suite/parts/r/partition_datetime_myisam.result +++ b/mysql-test/suite/parts/r/partition_datetime_myisam.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59'); select * from t1; a @@ -40,7 +40,7 @@ t2 CREATE TABLE `t2` ( `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16'); select * from t2; @@ -137,11 +137,11 @@ t1 CREATE TABLE `t1` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15'); select * from t1; a @@ -167,7 +167,7 @@ t2 CREATE TABLE `t2` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15'); select * from t2; @@ -291,13 +291,13 @@ t3 CREATE TABLE `t3` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES LESS THAN (4) ENGINE = MyISAM, - PARTITION quarter2 VALUES LESS THAN (7) ENGINE = MyISAM, - PARTITION quarter3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION quarter4 VALUES LESS THAN (13) ENGINE = MyISAM) +(PARTITION `quarter1` VALUES LESS THAN (4) ENGINE = MyISAM, + PARTITION `quarter2` VALUES LESS THAN (7) ENGINE = MyISAM, + PARTITION `quarter3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `quarter4` VALUES LESS THAN (13) ENGINE = MyISAM) 12 inserts; select count(*) from t3; count(*) @@ -331,13 +331,13 @@ t4 CREATE TABLE `t4` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES IN (1,2,3) ENGINE = MyISAM, - PARTITION quarter2 VALUES IN (4,5,6) ENGINE = MyISAM, - PARTITION quarter3 VALUES IN (7,8,9) ENGINE = MyISAM, - PARTITION quarter4 VALUES IN (10,11,12) ENGINE = MyISAM) +(PARTITION `quarter1` VALUES IN (1,2,3) ENGINE = MyISAM, + PARTITION `quarter2` VALUES IN (4,5,6) ENGINE = MyISAM, + PARTITION `quarter3` VALUES IN (7,8,9) ENGINE = MyISAM, + PARTITION `quarter4` VALUES IN (10,11,12) ENGINE = MyISAM) 12 inserts; select count(*) from t4; count(*) @@ -369,11 +369,11 @@ t1 CREATE TABLE `t1` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values ('21:21:21'), ('12:10:30'), ('03:03:03'), ('23:59'); select * from t1; a @@ -399,7 +399,7 @@ t2 CREATE TABLE `t2` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('0:1:1'), ('10:11:12'), ('13:14:15'), ('14:15:16'); select * from t2; @@ -498,13 +498,13 @@ t3 CREATE TABLE `t3` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (second(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (second(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES LESS THAN (16) ENGINE = MyISAM, - PARTITION quarter2 VALUES LESS THAN (31) ENGINE = MyISAM, - PARTITION quarter3 VALUES LESS THAN (46) ENGINE = MyISAM, - PARTITION quarter4 VALUES LESS THAN (61) ENGINE = MyISAM) +(PARTITION `quarter1` VALUES LESS THAN (16) ENGINE = MyISAM, + PARTITION `quarter2` VALUES LESS THAN (31) ENGINE = MyISAM, + PARTITION `quarter3` VALUES LESS THAN (46) ENGINE = MyISAM, + PARTITION `quarter4` VALUES LESS THAN (61) ENGINE = MyISAM) 59 inserts; select count(*) from t3; count(*) @@ -585,13 +585,13 @@ t4 CREATE TABLE `t4` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (second(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (second(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES IN (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ENGINE = MyISAM, - PARTITION quarter2 VALUES IN (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, - PARTITION quarter3 VALUES IN (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45) ENGINE = MyISAM, - PARTITION quarter4 VALUES IN (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) +(PARTITION `quarter1` VALUES IN (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ENGINE = MyISAM, + PARTITION `quarter2` VALUES IN (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, + PARTITION `quarter3` VALUES IN (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45) ENGINE = MyISAM, + PARTITION `quarter4` VALUES IN (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) 59 inserts; select count(*) from t4; count(*) @@ -670,11 +670,11 @@ t1 CREATE TABLE `t1` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59'); select * from t1; a @@ -700,7 +700,7 @@ t2 CREATE TABLE `t2` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16'); select * from t2; @@ -799,13 +799,13 @@ t3 CREATE TABLE `t3` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES LESS THAN (4) ENGINE = MyISAM, - PARTITION quarter2 VALUES LESS THAN (7) ENGINE = MyISAM, - PARTITION quarter3 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION quarter4 VALUES LESS THAN (13) ENGINE = MyISAM) +(PARTITION `quarter1` VALUES LESS THAN (4) ENGINE = MyISAM, + PARTITION `quarter2` VALUES LESS THAN (7) ENGINE = MyISAM, + PARTITION `quarter3` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `quarter4` VALUES LESS THAN (13) ENGINE = MyISAM) 12 inserts; select count(*) from t3; count(*) @@ -839,13 +839,13 @@ t4 CREATE TABLE `t4` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES IN (1,2,3) ENGINE = MyISAM, - PARTITION quarter2 VALUES IN (4,5,6) ENGINE = MyISAM, - PARTITION quarter3 VALUES IN (7,8,9) ENGINE = MyISAM, - PARTITION quarter4 VALUES IN (10,11,12) ENGINE = MyISAM) +(PARTITION `quarter1` VALUES IN (1,2,3) ENGINE = MyISAM, + PARTITION `quarter2` VALUES IN (4,5,6) ENGINE = MyISAM, + PARTITION `quarter3` VALUES IN (7,8,9) ENGINE = MyISAM, + PARTITION `quarter4` VALUES IN (10,11,12) ENGINE = MyISAM) 12 inserts; select count(*) from t4; count(*) @@ -877,11 +877,11 @@ t1 CREATE TABLE `t1` ( `a` year(4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values ('1975'), (2020), ('1980'), ('2000'); select * from t1; a @@ -907,7 +907,7 @@ t2 CREATE TABLE `t2` ( `a` year(4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975'), ('2020'), ('1980'), ('2000'); select * from t2; diff --git a/mysql-test/suite/parts/r/partition_debug.result b/mysql-test/suite/parts/r/partition_debug.result index aa33b3ffa57..0c43cc70c99 100644 --- a/mysql-test/suite/parts/r/partition_debug.result +++ b/mysql-test/suite/parts/r/partition_debug.result @@ -55,9 +55,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -100,9 +100,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -167,9 +167,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -212,9 +212,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -279,9 +279,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -324,9 +324,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -391,9 +391,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -436,9 +436,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -503,9 +503,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -548,9 +548,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -615,9 +615,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -660,9 +660,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -727,9 +727,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -772,9 +772,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -839,9 +839,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -884,9 +884,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -951,9 +951,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -996,9 +996,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 11 Original from partition p1 @@ -1063,9 +1063,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1098,9 +1098,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1165,9 +1165,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1200,9 +1200,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1267,9 +1267,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1302,9 +1302,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) 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=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1404,9 +1404,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1471,9 +1471,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1506,9 +1506,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1573,9 +1573,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1608,9 +1608,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1675,9 +1675,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1710,9 +1710,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1777,9 +1777,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1812,9 +1812,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1879,9 +1879,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1914,9 +1914,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1; a b 11 Original from partition p1 diff --git a/mysql-test/suite/parts/r/partition_debug_innodb.result b/mysql-test/suite/parts/r/partition_debug_innodb.result index 0cc8b5454a2..5af7990c84b 100644 --- a/mysql-test/suite/parts/r/partition_debug_innodb.result +++ b/mysql-test/suite/parts/r/partition_debug_innodb.result @@ -30,9 +30,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -62,9 +62,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -95,9 +95,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -129,9 +129,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -162,9 +162,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -196,9 +196,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -229,9 +229,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -263,9 +263,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -296,9 +296,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -364,9 +364,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -399,9 +399,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -432,9 +432,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -467,9 +467,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -500,9 +500,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -536,10 +536,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -570,9 +570,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -604,10 +604,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -638,9 +638,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -672,10 +672,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -707,9 +707,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -734,9 +734,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -766,9 +766,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -794,9 +794,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -828,9 +828,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -855,9 +855,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -915,9 +915,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -949,9 +949,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -976,9 +976,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1008,9 +1008,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1036,9 +1036,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1070,9 +1070,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1097,9 +1097,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1129,9 +1129,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1157,9 +1157,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1191,9 +1191,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1218,9 +1218,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1250,9 +1250,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1278,9 +1278,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1312,9 +1312,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1371,9 +1371,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1399,9 +1399,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1433,9 +1433,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1460,9 +1460,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1492,9 +1492,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1520,9 +1520,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1554,9 +1554,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1582,10 +1582,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1615,9 +1615,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1644,10 +1644,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1679,9 +1679,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1707,10 +1707,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1740,9 +1740,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1769,10 +1769,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1804,9 +1804,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1832,10 +1832,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1865,9 +1865,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1894,10 +1894,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1930,9 +1930,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1961,9 +1961,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1994,9 +1994,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2027,9 +2027,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2060,9 +2060,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2093,9 +2093,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2126,9 +2126,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2158,8 +2158,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2186,9 +2186,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2218,8 +2218,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2246,9 +2246,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2278,8 +2278,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2306,9 +2306,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2336,8 +2336,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2364,9 +2364,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2393,8 +2393,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2421,9 +2421,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2450,8 +2450,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2479,9 +2479,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2505,9 +2505,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2537,9 +2537,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2564,9 +2564,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2598,9 +2598,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2624,9 +2624,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2656,9 +2656,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2683,9 +2683,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2717,9 +2717,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2743,9 +2743,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2775,9 +2775,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2802,9 +2802,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2836,9 +2836,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2861,8 +2861,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2888,9 +2888,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2914,8 +2914,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2943,9 +2943,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2968,8 +2968,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2995,9 +2995,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3021,8 +3021,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3050,9 +3050,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3075,8 +3075,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3102,9 +3102,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3128,8 +3128,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3157,9 +3157,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3182,8 +3182,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3209,9 +3209,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3235,8 +3235,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3264,9 +3264,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3289,8 +3289,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3316,9 +3316,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3342,8 +3342,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3371,9 +3371,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3396,8 +3396,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3423,9 +3423,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3449,8 +3449,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3480,9 +3480,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3513,9 +3513,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3546,9 +3546,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3581,9 +3581,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3614,9 +3614,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3649,9 +3649,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3682,9 +3682,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3719,9 +3719,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3752,9 +3752,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3789,9 +3789,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3822,9 +3822,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3859,9 +3859,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3892,9 +3892,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3930,10 +3930,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3964,9 +3964,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4002,10 +4002,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4036,9 +4036,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4072,10 +4072,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4106,9 +4106,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4142,10 +4142,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4176,9 +4176,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4211,10 +4211,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4280,10 +4280,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4316,9 +4316,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4344,9 +4344,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4376,9 +4376,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4405,9 +4405,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4439,9 +4439,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4467,9 +4467,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4499,9 +4499,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4528,9 +4528,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4562,9 +4562,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) 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=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4622,9 +4622,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4651,9 +4651,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4685,9 +4685,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4713,9 +4713,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4745,9 +4745,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4774,9 +4774,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4808,9 +4808,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4836,9 +4836,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4868,9 +4868,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4897,9 +4897,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4931,9 +4931,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4959,9 +4959,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4991,9 +4991,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5020,9 +5020,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5054,9 +5054,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5083,10 +5083,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5116,9 +5116,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5146,10 +5146,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5181,9 +5181,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5210,10 +5210,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5243,9 +5243,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5273,10 +5273,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5308,9 +5308,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5337,10 +5337,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5370,9 +5370,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5400,10 +5400,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5435,9 +5435,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5464,10 +5464,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5497,9 +5497,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5527,10 +5527,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5562,9 +5562,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5591,10 +5591,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5624,9 +5624,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5654,10 +5654,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5689,9 +5689,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5718,10 +5718,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5751,9 +5751,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5781,10 +5781,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = InnoDB, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = InnoDB, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5838,9 +5838,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5877,9 +5877,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5943,9 +5943,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5982,9 +5982,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6048,9 +6048,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6087,9 +6087,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6153,9 +6153,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6192,9 +6192,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6258,9 +6258,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6297,9 +6297,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6363,9 +6363,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6402,9 +6402,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6468,9 +6468,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6507,9 +6507,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6573,9 +6573,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6612,9 +6612,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6678,9 +6678,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6717,9 +6717,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 11 Original from partition p1 @@ -6783,9 +6783,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6815,9 +6815,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6881,9 +6881,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6913,9 +6913,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6979,9 +6979,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7011,9 +7011,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7077,9 +7077,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7109,9 +7109,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7175,9 +7175,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7207,9 +7207,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7273,9 +7273,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7305,9 +7305,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7371,9 +7371,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7403,9 +7403,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7469,9 +7469,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7501,9 +7501,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7567,9 +7567,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 1 Original from partition p0 @@ -7599,9 +7599,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a b 11 Original from partition p1 diff --git a/mysql-test/suite/parts/r/partition_debug_myisam.result b/mysql-test/suite/parts/r/partition_debug_myisam.result index c0ddc1bfb16..ba31418bfb0 100644 --- a/mysql-test/suite/parts/r/partition_debug_myisam.result +++ b/mysql-test/suite/parts/r/partition_debug_myisam.result @@ -29,9 +29,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -65,9 +65,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -100,9 +100,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -138,9 +138,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -173,9 +173,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -211,9 +211,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -246,9 +246,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -284,9 +284,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -319,9 +319,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -359,9 +359,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -394,9 +394,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -434,9 +434,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -469,9 +469,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -509,9 +509,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -544,9 +544,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -586,10 +586,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -622,9 +622,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -662,10 +662,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -698,9 +698,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -738,10 +738,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -775,9 +775,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) 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=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -838,9 +838,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -868,9 +868,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -904,9 +904,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -933,9 +933,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -967,9 +967,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -997,9 +997,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1033,9 +1033,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1062,9 +1062,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1096,9 +1096,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1126,9 +1126,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1162,9 +1162,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1191,9 +1191,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1225,9 +1225,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1255,9 +1255,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1291,9 +1291,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1320,9 +1320,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1354,9 +1354,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1384,9 +1384,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1420,9 +1420,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1449,9 +1449,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) 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=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1513,9 +1513,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1549,9 +1549,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1578,9 +1578,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1612,9 +1612,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1642,9 +1642,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1678,9 +1678,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1709,10 +1709,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1744,9 +1744,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1776,10 +1776,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1813,9 +1813,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1844,10 +1844,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1879,9 +1879,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1911,10 +1911,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1948,9 +1948,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -1979,10 +1979,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2014,9 +2014,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2046,10 +2046,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2084,9 +2084,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2119,9 +2119,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2154,9 +2154,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2191,9 +2191,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2226,9 +2226,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2263,9 +2263,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2298,9 +2298,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2333,8 +2333,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2363,9 +2363,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2398,8 +2398,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2428,9 +2428,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2463,8 +2463,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2493,9 +2493,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2526,8 +2526,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2556,9 +2556,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2587,8 +2587,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2617,9 +2617,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2648,8 +2648,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2679,9 +2679,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2707,9 +2707,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2741,9 +2741,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2770,9 +2770,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2806,9 +2806,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2834,9 +2834,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2868,9 +2868,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2897,9 +2897,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2933,9 +2933,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) 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=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -2995,9 +2995,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3024,9 +3024,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3060,9 +3060,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3086,8 +3086,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3115,9 +3115,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3142,8 +3142,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3173,9 +3173,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3199,8 +3199,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3228,9 +3228,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3255,8 +3255,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3286,9 +3286,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3312,8 +3312,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3341,9 +3341,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3368,8 +3368,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3399,9 +3399,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3425,8 +3425,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3454,9 +3454,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3481,8 +3481,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3512,9 +3512,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3538,8 +3538,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3567,9 +3567,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3594,8 +3594,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3625,9 +3625,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3651,8 +3651,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3680,9 +3680,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3707,8 +3707,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3740,9 +3740,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3777,9 +3777,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3812,9 +3812,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3851,9 +3851,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3886,9 +3886,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3925,9 +3925,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -3960,9 +3960,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4003,9 +4003,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4038,9 +4038,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4081,9 +4081,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4116,9 +4116,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4159,9 +4159,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4194,9 +4194,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4239,10 +4239,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4275,9 +4275,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4320,10 +4320,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4356,9 +4356,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4399,10 +4399,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4435,9 +4435,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4478,10 +4478,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4514,9 +4514,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4555,10 +4555,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4591,9 +4591,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4632,10 +4632,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4670,9 +4670,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4700,9 +4700,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4734,9 +4734,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4765,9 +4765,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4801,9 +4801,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4831,9 +4831,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4865,9 +4865,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4896,9 +4896,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4932,9 +4932,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4962,9 +4962,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -4996,9 +4996,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5027,9 +5027,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5063,9 +5063,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5093,9 +5093,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5127,9 +5127,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5158,9 +5158,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5194,9 +5194,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5224,9 +5224,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5258,9 +5258,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5289,9 +5289,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5325,9 +5325,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5355,9 +5355,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5389,9 +5389,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5420,9 +5420,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5456,9 +5456,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5488,10 +5488,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5523,9 +5523,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5556,10 +5556,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5593,9 +5593,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5625,10 +5625,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) 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=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5693,10 +5693,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5730,9 +5730,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5762,10 +5762,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5797,9 +5797,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5830,10 +5830,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5867,9 +5867,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5899,10 +5899,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5934,9 +5934,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -5967,10 +5967,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6004,9 +6004,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6036,10 +6036,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6071,9 +6071,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6104,10 +6104,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6141,9 +6141,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6173,10 +6173,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6208,9 +6208,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (11,12,13,14,15,16,17,18,19) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 @@ -6241,10 +6241,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(64) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION p0 VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, - PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, - PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `p0` VALUES IN (0,1,2,3,4,5,6,7,8,9) ENGINE = MyISAM, + PARTITION `p10` VALUES IN (10,11,12,13,14,15,16,17,18,19) ENGINE = MyISAM, + PARTITION `p20` VALUES IN (20,21,22,23,24,25,26,27,28,29) ENGINE = MyISAM) SELECT * FROM t1; a b 1 Original from partition p0 diff --git a/mysql-test/suite/parts/r/partition_debug_sync_innodb.result b/mysql-test/suite/parts/r/partition_debug_sync_innodb.result index a34085675cf..678d1968aa4 100644 --- a/mysql-test/suite/parts/r/partition_debug_sync_innodb.result +++ b/mysql-test/suite/parts/r/partition_debug_sync_innodb.result @@ -51,8 +51,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) t1#P#p0.ibd t1.frm t1.par @@ -88,9 +88,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p10 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p10` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1; a 1 diff --git a/mysql-test/suite/parts/r/partition_decimal_innodb.result b/mysql-test/suite/parts/r/partition_decimal_innodb.result index 58c51f0ed3c..648567a14ca 100644 --- a/mysql-test/suite/parts/r/partition_decimal_innodb.result +++ b/mysql-test/suite/parts/r/partition_decimal_innodb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` decimal(10,4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values (999999.9999), (-999999.9999), (123456.7899), (-123456.7899), (-1.5), (1), (0), (-1), (1.5), (1234.567), (-1234.567); select * from t1; a @@ -54,7 +54,7 @@ t2 CREATE TABLE `t2` ( `a` decimal(18,9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 10 insert into t2 values (999999999.999999999), (-999999999.999999999), (-1.5), (-1), (0), (1.5), (1234.567), (-1234.567); select * from t2; @@ -100,14 +100,14 @@ t3 CREATE TABLE `t3` ( `a` decimal(18,9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (floor(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (floor(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa2 VALUES LESS THAN (2) ENGINE = InnoDB, - PARTITION pa4 VALUES LESS THAN (4) ENGINE = InnoDB, - PARTITION pa6 VALUES LESS THAN (6) ENGINE = InnoDB, - PARTITION pa8 VALUES LESS THAN (8) ENGINE = InnoDB, - PARTITION pa10 VALUES LESS THAN (10) ENGINE = InnoDB) +(PARTITION `pa2` VALUES LESS THAN (2) ENGINE = InnoDB, + PARTITION `pa4` VALUES LESS THAN (4) ENGINE = InnoDB, + PARTITION `pa6` VALUES LESS THAN (6) ENGINE = InnoDB, + PARTITION `pa8` VALUES LESS THAN (8) ENGINE = InnoDB, + PARTITION `pa10` VALUES LESS THAN (10) ENGINE = InnoDB) 9*3 inserts; select count(*) from t3; count(*) @@ -127,14 +127,14 @@ t4 CREATE TABLE `t4` ( `a` decimal(18,9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (ceiling(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (ceiling(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa2 VALUES IN (1,2) ENGINE = InnoDB, - PARTITION pa4 VALUES IN (3,4) ENGINE = InnoDB, - PARTITION pa6 VALUES IN (5,6) ENGINE = InnoDB, - PARTITION pa8 VALUES IN (7,8) ENGINE = InnoDB, - PARTITION pa10 VALUES IN (9,10) ENGINE = InnoDB) +(PARTITION `pa2` VALUES IN (1,2) ENGINE = InnoDB, + PARTITION `pa4` VALUES IN (3,4) ENGINE = InnoDB, + PARTITION `pa6` VALUES IN (5,6) ENGINE = InnoDB, + PARTITION `pa8` VALUES IN (7,8) ENGINE = InnoDB, + PARTITION `pa10` VALUES IN (9,10) ENGINE = InnoDB) 9*3 inserts; select count(*) from t4; count(*) diff --git a/mysql-test/suite/parts/r/partition_decimal_myisam.result b/mysql-test/suite/parts/r/partition_decimal_myisam.result index 956923117a5..14999651451 100644 --- a/mysql-test/suite/parts/r/partition_decimal_myisam.result +++ b/mysql-test/suite/parts/r/partition_decimal_myisam.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` decimal(10,4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values (999999.9999), (-999999.9999), (123456.7899), (-123456.7899), (-1.5), (1), (0), (-1), (1.5), (1234.567), (-1234.567); select * from t1; a @@ -54,7 +54,7 @@ t2 CREATE TABLE `t2` ( `a` decimal(18,9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 10 insert into t2 values (999999999.999999999), (-999999999.999999999), (-1.5), (-1), (0), (1.5), (1234.567), (-1234.567); select * from t2; @@ -100,14 +100,14 @@ t3 CREATE TABLE `t3` ( `a` decimal(18,9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (floor(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (floor(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa2 VALUES LESS THAN (2) ENGINE = MyISAM, - PARTITION pa4 VALUES LESS THAN (4) ENGINE = MyISAM, - PARTITION pa6 VALUES LESS THAN (6) ENGINE = MyISAM, - PARTITION pa8 VALUES LESS THAN (8) ENGINE = MyISAM, - PARTITION pa10 VALUES LESS THAN (10) ENGINE = MyISAM) +(PARTITION `pa2` VALUES LESS THAN (2) ENGINE = MyISAM, + PARTITION `pa4` VALUES LESS THAN (4) ENGINE = MyISAM, + PARTITION `pa6` VALUES LESS THAN (6) ENGINE = MyISAM, + PARTITION `pa8` VALUES LESS THAN (8) ENGINE = MyISAM, + PARTITION `pa10` VALUES LESS THAN (10) ENGINE = MyISAM) 9*3 inserts; select count(*) from t3; count(*) @@ -127,14 +127,14 @@ t4 CREATE TABLE `t4` ( `a` decimal(18,9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (ceiling(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (ceiling(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa2 VALUES IN (1,2) ENGINE = MyISAM, - PARTITION pa4 VALUES IN (3,4) ENGINE = MyISAM, - PARTITION pa6 VALUES IN (5,6) ENGINE = MyISAM, - PARTITION pa8 VALUES IN (7,8) ENGINE = MyISAM, - PARTITION pa10 VALUES IN (9,10) ENGINE = MyISAM) +(PARTITION `pa2` VALUES IN (1,2) ENGINE = MyISAM, + PARTITION `pa4` VALUES IN (3,4) ENGINE = MyISAM, + PARTITION `pa6` VALUES IN (5,6) ENGINE = MyISAM, + PARTITION `pa8` VALUES IN (7,8) ENGINE = MyISAM, + PARTITION `pa10` VALUES IN (9,10) ENGINE = MyISAM) 9*3 inserts; select count(*) from t4; count(*) diff --git a/mysql-test/suite/parts/r/partition_double_innodb.result b/mysql-test/suite/parts/r/partition_double_innodb.result index f2618519930..9c6d930a490 100644 --- a/mysql-test/suite/parts/r/partition_double_innodb.result +++ b/mysql-test/suite/parts/r/partition_double_innodb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` double NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208); select * from t1; a @@ -48,7 +48,7 @@ t2 CREATE TABLE `t2` ( `a` double NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 10 insert into t2 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208); select * from t2; diff --git a/mysql-test/suite/parts/r/partition_double_myisam.result b/mysql-test/suite/parts/r/partition_double_myisam.result index b01db2f7d31..9ab32b1f841 100644 --- a/mysql-test/suite/parts/r/partition_double_myisam.result +++ b/mysql-test/suite/parts/r/partition_double_myisam.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` double NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208); select * from t1; a @@ -48,7 +48,7 @@ t2 CREATE TABLE `t2` ( `a` double NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 10 insert into t2 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208); select * from t2; diff --git a/mysql-test/suite/parts/r/partition_engine_innodb.result b/mysql-test/suite/parts/r/partition_engine_innodb.result index ec306c42648..002fe90c78a 100644 --- a/mysql-test/suite/parts/r/partition_engine_innodb.result +++ b/mysql-test/suite/parts/r/partition_engine_innodb.result @@ -68,7 +68,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 # check prerequisites-1 success: 1 @@ -525,9 +525,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part1 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -984,14 +984,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1509,14 +1509,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2010,14 +2010,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2472,14 +2472,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2934,9 +2934,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part1 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3393,14 +3393,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3858,14 +3858,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4316,8 +4316,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part1 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = InnoDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4770,11 +4770,11 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (1000) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (1000) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_engine_myisam.result b/mysql-test/suite/parts/r/partition_engine_myisam.result index 30f3b8116f7..f940b250c19 100644 --- a/mysql-test/suite/parts/r/partition_engine_myisam.result +++ b/mysql-test/suite/parts/r/partition_engine_myisam.result @@ -68,7 +68,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -534,9 +534,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part1 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM) unified filelist t1#P#part1.MYD @@ -1002,14 +1002,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -1540,14 +1540,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -2054,14 +2054,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -2529,14 +2529,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -3004,9 +3004,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part1 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM) unified filelist t1#P#part1.MYD @@ -3472,14 +3472,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -3950,14 +3950,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -4421,8 +4421,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part1 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = MyISAM) unified filelist t1#P#part1.MYD @@ -4882,11 +4882,11 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (1000) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (1000) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD diff --git a/mysql-test/suite/parts/r/partition_exch_qa_1_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_1_innodb.result index 12996c0668a..2b6d8e4dac2 100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_1_innodb.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_1_innodb.result @@ -128,10 +128,10 @@ tp CREATE TABLE `tp` ( PRIMARY KEY (`a`), UNIQUE KEY `a` (`a`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION p2 VALUES LESS THAN (1000) ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `p2` VALUES LESS THAN (1000) ENGINE = InnoDB) ALTER TABLE tp DROP INDEX a; ALTER TABLE t_10 DROP INDEX a; ALTER TABLE tp ADD UNIQUE INDEX USING BTREE (a,b); @@ -153,10 +153,10 @@ tp CREATE TABLE `tp` ( PRIMARY KEY (`a`), UNIQUE KEY `a` (`a`,`b`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION p2 VALUES LESS THAN (1000) ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `p2` VALUES LESS THAN (1000) ENGINE = InnoDB) DROP TABLE IF EXISTS t_10; DROP TABLE IF EXISTS t_100; DROP TABLE IF EXISTS t_1000; diff --git a/mysql-test/suite/parts/r/partition_exch_qa_1_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_1_myisam.result index d6a45d7dc5f..73d1775ab4a 100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_1_myisam.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_1_myisam.result @@ -128,10 +128,10 @@ tp CREATE TABLE `tp` ( PRIMARY KEY (`a`), UNIQUE KEY `a` (`a`) USING BTREE ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (1000) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN (1000) ENGINE = MyISAM) ALTER TABLE tp DROP INDEX a; ALTER TABLE t_10 DROP INDEX a; ALTER TABLE tp ADD UNIQUE INDEX USING BTREE (a,b); @@ -153,10 +153,10 @@ tp CREATE TABLE `tp` ( PRIMARY KEY (`a`), UNIQUE KEY `a` (`a`,`b`) USING BTREE ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (1000) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN (1000) ENGINE = MyISAM) DROP TABLE IF EXISTS t_10; DROP TABLE IF EXISTS t_100; DROP TABLE IF EXISTS t_1000; diff --git a/mysql-test/suite/parts/r/partition_exchange_innodb.result b/mysql-test/suite/parts/r/partition_exchange_innodb.result index 97aef348c59..a994910d698 100644 --- a/mysql-test/suite/parts/r/partition_exchange_innodb.result +++ b/mysql-test/suite/parts/r/partition_exchange_innodb.result @@ -13,7 +13,7 @@ tp CREATE TABLE `tp` ( `b` varchar(24) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 4 SHOW CREATE TABLE t; Table Create Table @@ -86,7 +86,7 @@ tp CREATE TABLE `tp` ( `b` varchar(24) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB AUTO_INCREMENT=112 DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 4 SHOW CREATE TABLE t; Table Create Table @@ -194,9 +194,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SET DEBUG_SYNC= 'now SIGNAL goto_verification'; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # select from t and select/update/delete/insert from tp should work @@ -237,9 +237,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SET DEBUG_SYNC= 'now SIGNAL goto_wait'; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # Both tables should now be under exclusive lock, even SHOW should fail @@ -312,9 +312,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM tp WHERE a = 99; a b 99 End of values @@ -346,9 +346,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t; a b 10 Ten diff --git a/mysql-test/suite/parts/r/partition_exchange_memory.result b/mysql-test/suite/parts/r/partition_exchange_memory.result index 9c270422e17..5aa4108980c 100644 --- a/mysql-test/suite/parts/r/partition_exchange_memory.result +++ b/mysql-test/suite/parts/r/partition_exchange_memory.result @@ -13,7 +13,7 @@ tp CREATE TABLE `tp` ( `b` varchar(24) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 4 SHOW CREATE TABLE t; Table Create Table @@ -86,7 +86,7 @@ tp CREATE TABLE `tp` ( `b` varchar(24) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MEMORY AUTO_INCREMENT=112 DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 4 SHOW CREATE TABLE t; Table Create Table @@ -194,9 +194,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MEMORY, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MEMORY, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MEMORY) SET DEBUG_SYNC= 'now SIGNAL goto_verification'; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # select from t and select/update/delete/insert from tp should work @@ -237,9 +237,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MEMORY, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MEMORY, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MEMORY) SET DEBUG_SYNC= 'now SIGNAL goto_wait'; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # Both tables should now be under exclusive lock, even SHOW should fail @@ -312,9 +312,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MEMORY, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MEMORY, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MEMORY) SELECT * FROM tp WHERE a = 99; a b 99 End of values @@ -346,9 +346,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MEMORY, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MEMORY, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MEMORY) SELECT * FROM t; a b 10 Ten diff --git a/mysql-test/suite/parts/r/partition_exchange_myisam.result b/mysql-test/suite/parts/r/partition_exchange_myisam.result index ecabe7bde1d..c30ff60ed7c 100644 --- a/mysql-test/suite/parts/r/partition_exchange_myisam.result +++ b/mysql-test/suite/parts/r/partition_exchange_myisam.result @@ -13,7 +13,7 @@ tp CREATE TABLE `tp` ( `b` varchar(24) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 4 SHOW CREATE TABLE t; Table Create Table @@ -86,7 +86,7 @@ tp CREATE TABLE `tp` ( `b` varchar(24) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM AUTO_INCREMENT=112 DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 4 SHOW CREATE TABLE t; Table Create Table @@ -194,9 +194,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SET DEBUG_SYNC= 'now SIGNAL goto_verification'; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # select from t and select/update/delete/insert from tp should work @@ -237,9 +237,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SET DEBUG_SYNC= 'now SIGNAL goto_wait'; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # Both tables should now be under exclusive lock, even SHOW should fail @@ -312,9 +312,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM tp WHERE a = 99; a b 99 End of values @@ -346,9 +346,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t; a b 10 Ten diff --git a/mysql-test/suite/parts/r/partition_float_innodb.result b/mysql-test/suite/parts/r/partition_float_innodb.result index 863d9bfe000..1163c8dafda 100644 --- a/mysql-test/suite/parts/r/partition_float_innodb.result +++ b/mysql-test/suite/parts/r/partition_float_innodb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` float NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values (-3.402823466E+38), (3.402823466E+38), (-1.5), (-1), (0), (1), (1.5); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` float NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 10 insert into t2 values (-3.402823466E+38), (-3.402823466E+37), (-123.456), (0), (1234546.789), (123.456), (1.5); select * from t2; diff --git a/mysql-test/suite/parts/r/partition_float_myisam.result b/mysql-test/suite/parts/r/partition_float_myisam.result index ff77ae17b37..787e6a855c8 100644 --- a/mysql-test/suite/parts/r/partition_float_myisam.result +++ b/mysql-test/suite/parts/r/partition_float_myisam.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` float NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values (-3.402823466E+38), (3.402823466E+38), (-1.5), (-1), (0), (1), (1.5); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` float NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 10 insert into t2 values (-3.402823466E+38), (-3.402823466E+37), (-123.456), (0), (1234546.789), (123.456), (1.5); select * from t2; diff --git a/mysql-test/suite/parts/r/partition_int_innodb.result b/mysql-test/suite/parts/r/partition_int_innodb.result index 31a61209d4d..aca367070fd 100644 --- a/mysql-test/suite/parts/r/partition_int_innodb.result +++ b/mysql-test/suite/parts/r/partition_int_innodb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` int(10) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values (4294967295), (4294967294), (4294967293), (4294967292), (1), (2), (65535); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` int(10) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (4294967295), (4294967294), (4294967293), (4294967292); select * from t2; @@ -78,7 +78,7 @@ t3 CREATE TABLE `t3` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (2147483647), (2147483646), (2147483645), (2147483644), (-2147483648), (-2147483647), (1), (-1), (0); select * from t3; diff --git a/mysql-test/suite/parts/r/partition_int_myisam.result b/mysql-test/suite/parts/r/partition_int_myisam.result index 813d4b20e1a..2f5506d2b4d 100644 --- a/mysql-test/suite/parts/r/partition_int_myisam.result +++ b/mysql-test/suite/parts/r/partition_int_myisam.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` int(10) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values (4294967295), (4294967294), (4294967293), (4294967292), (1), (2), (65535); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` int(10) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (4294967295), (4294967294), (4294967293), (4294967292); select * from t2; @@ -78,7 +78,7 @@ t3 CREATE TABLE `t3` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (2147483647), (2147483646), (2147483645), (2147483644), (-2147483648), (-2147483647), (1), (-1), (0); select * from t3; diff --git a/mysql-test/suite/parts/r/partition_mediumint_innodb.result b/mysql-test/suite/parts/r/partition_mediumint_innodb.result index 3e04cf23754..3e579c7449d 100644 --- a/mysql-test/suite/parts/r/partition_mediumint_innodb.result +++ b/mysql-test/suite/parts/r/partition_mediumint_innodb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` mediumint(8) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values (16777215), (16777214), (16777213), (16777212), (1), (2), (65535); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` mediumint(8) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (16777215), (16777214), (16777213), (16777212); select * from t2; @@ -78,7 +78,7 @@ t3 CREATE TABLE `t3` ( `a` mediumint(9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (8388607), (8388606), (8388605), (8388604), (-8388608), (-8388607), (1), (-1), (0); select * from t3; diff --git a/mysql-test/suite/parts/r/partition_mediumint_myisam.result b/mysql-test/suite/parts/r/partition_mediumint_myisam.result index 21e2d29ea14..f1be34338ec 100644 --- a/mysql-test/suite/parts/r/partition_mediumint_myisam.result +++ b/mysql-test/suite/parts/r/partition_mediumint_myisam.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` mediumint(8) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values (16777215), (16777214), (16777213), (16777212), (1), (2), (65535); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` mediumint(8) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (16777215), (16777214), (16777213), (16777212); select * from t2; @@ -78,7 +78,7 @@ t3 CREATE TABLE `t3` ( `a` mediumint(9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (8388607), (8388606), (8388605), (8388604), (-8388608), (-8388607), (1), (-1), (0); select * from t3; diff --git a/mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result b/mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result index dcc48f46251..88469a339ad 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc0_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; @@ -271,11 +271,11 @@ 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 BY KEY (`a`) +(PARTITION `parta` ENGINE = InnoDB, + PARTITION `partB` ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB, + PARTITION `PartD` ENGINE = InnoDB) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -364,14 +364,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 @@ -392,10 +392,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 @@ -428,10 +428,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; @@ -507,11 +507,11 @@ 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 BY HASH (`a`) +(PARTITION `parta` ENGINE = InnoDB, + PARTITION `partB` ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB, + PARTITION `PartD` ENGINE = InnoDB) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -589,14 +589,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 @@ -620,12 +620,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 @@ -658,11 +658,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; @@ -738,11 +738,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 partB VALUES LESS THAN (7) ENGINE = InnoDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION PartD VALUES LESS THAN (13) 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) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -820,14 +820,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 @@ -851,12 +851,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) @@ -889,12 +889,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; @@ -961,11 +961,11 @@ 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 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) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -1004,10 +1004,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_lc0_memory.result b/mysql-test/suite/parts/r/partition_mgm_lc0_memory.result index 5451b5a6fd3..585bd24dca6 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc0_memory.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc0_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; @@ -271,11 +271,11 @@ 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 BY KEY (`a`) +(PARTITION `parta` ENGINE = MEMORY, + PARTITION `partB` ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY, + PARTITION `PartD` ENGINE = MEMORY) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -364,14 +364,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 @@ -392,10 +392,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 @@ -428,10 +428,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; @@ -507,11 +507,11 @@ 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 BY HASH (`a`) +(PARTITION `parta` ENGINE = MEMORY, + PARTITION `partB` ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY, + PARTITION `PartD` ENGINE = MEMORY) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -589,14 +589,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 @@ -620,12 +620,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 @@ -658,11 +658,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; @@ -738,11 +738,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 partB VALUES LESS THAN (7) ENGINE = MEMORY, - PARTITION Partc VALUES LESS THAN (10) ENGINE = MEMORY, - PARTITION PartD VALUES LESS THAN (13) 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) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -820,14 +820,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 @@ -851,12 +851,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) @@ -889,12 +889,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; @@ -961,11 +961,11 @@ 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 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) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -1004,10 +1004,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_lc0_myisam.result b/mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result index 40399ae3312..59181388bd0 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc0_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; @@ -271,11 +271,11 @@ 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 BY KEY (`a`) +(PARTITION `parta` ENGINE = MyISAM, + PARTITION `partB` ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM, + PARTITION `PartD` ENGINE = MyISAM) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -364,14 +364,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 @@ -392,10 +392,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 @@ -428,10 +428,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; @@ -507,11 +507,11 @@ 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 BY HASH (`a`) +(PARTITION `parta` ENGINE = MyISAM, + PARTITION `partB` ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM, + PARTITION `PartD` ENGINE = MyISAM) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -589,14 +589,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 @@ -620,12 +620,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 @@ -658,11 +658,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; @@ -738,11 +738,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 partB VALUES LESS THAN (7) ENGINE = MyISAM, - PARTITION Partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION PartD VALUES LESS THAN (13) 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) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -820,14 +820,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 @@ -851,12 +851,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) @@ -889,12 +889,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; @@ -961,11 +961,11 @@ 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 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) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -1004,10 +1004,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/r/partition_mgm_lc1_innodb.result b/mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result index 0aab26b189b..c4d63f663e1 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc1_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_lc1_memory.result b/mysql-test/suite/parts/r/partition_mgm_lc1_memory.result index 5e7da61802e..d29dfd343a6 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc1_memory.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc1_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_lc1_myisam.result b/mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result index 505bf6403a6..f26b975b75e 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc1_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/r/partition_smallint_innodb.result b/mysql-test/suite/parts/r/partition_smallint_innodb.result index baf9255bae1..dc4ed609212 100644 --- a/mysql-test/suite/parts/r/partition_smallint_innodb.result +++ b/mysql-test/suite/parts/r/partition_smallint_innodb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` smallint(5) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values (65535), (65534), (65533), (65532), (1), (2), (256); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` smallint(5) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (65535), (65534), (65533), (65532); select * from t2; @@ -78,7 +78,7 @@ t3 CREATE TABLE `t3` ( `a` smallint(6) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (32767), (32766), (32765), (32764), (-32768), (-32767), (1), (-1), (0); select * from t3; diff --git a/mysql-test/suite/parts/r/partition_smallint_myisam.result b/mysql-test/suite/parts/r/partition_smallint_myisam.result index 57a5dbe67a7..dac160a5e8c 100644 --- a/mysql-test/suite/parts/r/partition_smallint_myisam.result +++ b/mysql-test/suite/parts/r/partition_smallint_myisam.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` smallint(5) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values (65535), (65534), (65533), (65532), (1), (2), (256); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` smallint(5) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (65535), (65534), (65533), (65532); select * from t2; @@ -78,7 +78,7 @@ t3 CREATE TABLE `t3` ( `a` smallint(6) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (32767), (32766), (32765), (32764), (-32768), (-32767), (1), (-1), (0); select * from t3; diff --git a/mysql-test/suite/parts/r/partition_special_innodb.result b/mysql-test/suite/parts/r/partition_special_innodb.result index ace37228d8d..c375c2d2232 100644 --- a/mysql-test/suite/parts/r/partition_special_innodb.result +++ b/mysql-test/suite/parts/r/partition_special_innodb.result @@ -13,11 +13,11 @@ t1 CREATE TABLE `t1` ( `d` enum('m','w') NOT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`,`b`,`c`,`d`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m'), ('1983-12-31', 'cdef', 'srtbvsr', 'w'), @@ -55,11 +55,11 @@ t1 CREATE TABLE `t1` ( `i` char(255) DEFAULT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d,e,f,g,h) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, 'tbhth nrzh ztfghgfh fzh ftzhj fztjh'), ('1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, 'liuugbzvdmrlti b itiortudirtfgtibm dfi'), @@ -105,11 +105,11 @@ t1 CREATE TABLE `t1` ( `i` char(255) DEFAULT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113,'1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, 'tbhth nrzh ztfghgfh fzh ftzhj fztjh'), ('1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127,'1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, 'liuugbzvdmrlti b itiortudirtfgtibm dfi'), @@ -185,11 +185,11 @@ t1 CREATE TABLE `t1` ( `i` char(255) DEFAULT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d,e,f,g,h) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113,'1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113,'1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, '1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, 'tbhth nrzh ztfghgfh fzh ftzhj fztjh'), ('1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127,'1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, '1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, '1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, 'liuugbzvdmrlti b itiortudirtfgtibm dfi'), diff --git a/mysql-test/suite/parts/r/partition_special_myisam.result b/mysql-test/suite/parts/r/partition_special_myisam.result index df184e385ae..29f3f1d61b7 100644 --- a/mysql-test/suite/parts/r/partition_special_myisam.result +++ b/mysql-test/suite/parts/r/partition_special_myisam.result @@ -13,11 +13,11 @@ t1 CREATE TABLE `t1` ( `d` enum('m','w') NOT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`,`b`,`c`,`d`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m'), ('1983-12-31', 'cdef', 'srtbvsr', 'w'), @@ -55,11 +55,11 @@ t1 CREATE TABLE `t1` ( `i` char(255) DEFAULT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d,e,f,g,h) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, 'tbhth nrzh ztfghgfh fzh ftzhj fztjh'), ('1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, 'liuugbzvdmrlti b itiortudirtfgtibm dfi'), @@ -105,11 +105,11 @@ t1 CREATE TABLE `t1` ( `i` char(255) DEFAULT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113,'1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, 'tbhth nrzh ztfghgfh fzh ftzhj fztjh'), ('1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127,'1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, 'liuugbzvdmrlti b itiortudirtfgtibm dfi'), @@ -185,11 +185,11 @@ t1 CREATE TABLE `t1` ( `i` char(255) DEFAULT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d,e,f,g,h) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113,'1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113,'1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, '1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, 'tbhth nrzh ztfghgfh fzh ftzhj fztjh'), ('1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127,'1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, '1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, '1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, 'liuugbzvdmrlti b itiortudirtfgtibm dfi'), diff --git a/mysql-test/suite/parts/r/partition_syntax_innodb.result b/mysql-test/suite/parts/r/partition_syntax_innodb.result index f8de7ca5249..ff1ca17bd5d 100644 --- a/mysql-test/suite/parts/r/partition_syntax_innodb.result +++ b/mysql-test/suite/parts/r/partition_syntax_innodb.result @@ -658,9 +658,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,2)) -(PARTITION part1 VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part3 VALUES IN (1) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 2) +(PARTITION `part1` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (1) ENGINE = InnoDB) DROP TABLE t1; # 3.5.3 Reveal that IN (...NULL) is not mapped to IN(0) @@ -685,10 +685,10 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,2)) -(PARTITION part1 VALUES IN (NULL) ENGINE = InnoDB, - PARTITION part2 VALUES IN (0) ENGINE = InnoDB, - PARTITION part3 VALUES IN (1) ENGINE = InnoDB) + PARTITION BY LIST (`f_int1` % 2) +(PARTITION `part1` VALUES IN (NULL) ENGINE = InnoDB, + PARTITION `part2` VALUES IN (0) ENGINE = InnoDB, + PARTITION `part3` VALUES IN (1) ENGINE = InnoDB) DROP TABLE t1; @@ -719,7 +719,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) DROP TABLE t1; # 4.1.2 no partition number, named partitions @@ -741,9 +741,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part1 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB) DROP TABLE t1; # 4.1.3 variations on no partition/subpartition number, named partitions, @@ -826,17 +826,17 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (20) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB), - PARTITION part3 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart31 ENGINE = InnoDB, - SUBPARTITION subpart32 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (20) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB), + PARTITION `part3` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart31` ENGINE = InnoDB, + SUBPARTITION `subpart32` ENGINE = InnoDB)) DROP TABLE t1; #------------------------------------------------------------------------ @@ -862,7 +862,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 DROP TABLE t1; @@ -887,11 +887,11 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) SUBPARTITIONS 2 -(PARTITION part1 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part1` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part2` VALUES LESS THAN (2147483646) ENGINE = InnoDB) DROP TABLE t1; CREATE TABLE t1 ( @@ -912,7 +912,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 1 DROP TABLE t1; @@ -937,11 +937,11 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) SUBPARTITIONS 1 -(PARTITION part1 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = InnoDB) +(PARTITION `part1` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `part2` VALUES LESS THAN (2147483646) ENGINE = InnoDB) DROP TABLE t1; CREATE TABLE t1 ( @@ -1681,9 +1681,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part1 ENGINE = InnoDB, - PARTITION part2 ENGINE = InnoDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = InnoDB, + PARTITION `part2` ENGINE = InnoDB) DROP TABLE t1; CREATE TABLE t1 ( @@ -1710,14 +1710,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (1000) - (SUBPARTITION subpart11 ENGINE = InnoDB, - SUBPARTITION subpart12 ENGINE = InnoDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = InnoDB, - SUBPARTITION subpart22 ENGINE = InnoDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (1000) + (SUBPARTITION `subpart11` ENGINE = InnoDB, + SUBPARTITION `subpart12` ENGINE = InnoDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = InnoDB, + SUBPARTITION `subpart22` ENGINE = InnoDB)) DROP TABLE t1; # 4.3.2 (positive) number of partition/subpartition , diff --git a/mysql-test/suite/parts/r/partition_syntax_myisam.result b/mysql-test/suite/parts/r/partition_syntax_myisam.result index e7ae727ea02..b54591fe538 100644 --- a/mysql-test/suite/parts/r/partition_syntax_myisam.result +++ b/mysql-test/suite/parts/r/partition_syntax_myisam.result @@ -658,9 +658,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,2)) -(PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part3 VALUES IN (1) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 2) +(PARTITION `part1` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (1) ENGINE = MyISAM) unified filelist t1#P#part1.MYD @@ -693,10 +693,10 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (MOD(f_int1,2)) -(PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, - PARTITION part2 VALUES IN (0) ENGINE = MyISAM, - PARTITION part3 VALUES IN (1) ENGINE = MyISAM) + PARTITION BY LIST (`f_int1` % 2) +(PARTITION `part1` VALUES IN (NULL) ENGINE = MyISAM, + PARTITION `part2` VALUES IN (0) ENGINE = MyISAM, + PARTITION `part3` VALUES IN (1) ENGINE = MyISAM) unified filelist t1#P#part1.MYD @@ -737,7 +737,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) unified filelist t1#P#p0.MYD @@ -765,9 +765,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part1 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM) unified filelist t1#P#part1.MYD @@ -858,17 +858,17 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (20) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM), - PARTITION part3 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart31 ENGINE = MyISAM, - SUBPARTITION subpart32 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (20) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM), + PARTITION `part3` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart31` ENGINE = MyISAM, + SUBPARTITION `subpart32` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD @@ -910,7 +910,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 2 unified filelist @@ -943,11 +943,11 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) SUBPARTITIONS 2 -(PARTITION part1 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part1` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part2` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -980,7 +980,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) + PARTITION BY HASH (`f_int1`) PARTITIONS 1 unified filelist @@ -1011,11 +1011,11 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) SUBPARTITIONS 1 -(PARTITION part1 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = MyISAM) +(PARTITION `part1` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `part2` VALUES LESS THAN (2147483646) ENGINE = MyISAM) unified filelist t1#P#part1#SP#part1sp0.MYD @@ -1763,9 +1763,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (f_int1) -(PARTITION part1 ENGINE = MyISAM, - PARTITION part2 ENGINE = MyISAM) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = MyISAM, + PARTITION `part2` ENGINE = MyISAM) unified filelist t1#P#part1.MYD @@ -1800,14 +1800,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (f_int1) -SUBPARTITION BY HASH (f_int1) -(PARTITION part1 VALUES LESS THAN (1000) - (SUBPARTITION subpart11 ENGINE = MyISAM, - SUBPARTITION subpart12 ENGINE = MyISAM), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = MyISAM, - SUBPARTITION subpart22 ENGINE = MyISAM)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (1000) + (SUBPARTITION `subpart11` ENGINE = MyISAM, + SUBPARTITION `subpart12` ENGINE = MyISAM), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = MyISAM, + SUBPARTITION `subpart22` ENGINE = MyISAM)) unified filelist t1#P#part1#SP#subpart11.MYD diff --git a/mysql-test/suite/parts/r/partition_tinyint_innodb.result b/mysql-test/suite/parts/r/partition_tinyint_innodb.result index a607b29a78a..19f0e2c57c4 100644 --- a/mysql-test/suite/parts/r/partition_tinyint_innodb.result +++ b/mysql-test/suite/parts/r/partition_tinyint_innodb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) insert into t1 values (255), (254), (253), (252), (1), (2), (128); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (255), (254), (253), (252); select * from t2; @@ -78,7 +78,7 @@ t3 CREATE TABLE `t3` ( `a` tinyint(4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (127), (126), (125), (124), (-128), (-127), (1), (-1), (0); select * from t3; diff --git a/mysql-test/suite/parts/r/partition_tinyint_myisam.result b/mysql-test/suite/parts/r/partition_tinyint_myisam.result index dded4068b11..9ad4927697d 100644 --- a/mysql-test/suite/parts/r/partition_tinyint_myisam.result +++ b/mysql-test/suite/parts/r/partition_tinyint_myisam.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) insert into t1 values (255), (254), (253), (252), (1), (2), (128); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (255), (254), (253), (252); select * from t2; @@ -78,7 +78,7 @@ t3 CREATE TABLE `t3` ( `a` tinyint(4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (127), (126), (125), (124), (-128), (-127), (1), (-1), (0); select * from t3; diff --git a/mysql-test/suite/parts/r/quoting.result b/mysql-test/suite/parts/r/quoting.result new file mode 100644 index 00000000000..9495d790805 --- /dev/null +++ b/mysql-test/suite/parts/r/quoting.result @@ -0,0 +1,63 @@ +set sql_mode=ansi_quotes; +create table t1 ("select" int) partition by range ("select") (partition "select" values less than maxvalue); +create table t2 (f1 int) partition by range (f1) (partition p1 values less than maxvalue); +show create table t1; +Table Create Table +t1 CREATE TABLE "t1" ( + "select" int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE ("select") +(PARTITION "select" VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +show create table t2; +Table Create Table +t2 CREATE TABLE "t2" ( + "f1" int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE ("f1") +(PARTITION "p1" VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +set sql_quote_show_create=0; +show create table t1; +Table Create Table +t1 CREATE TABLE t1 ( + "select" int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE ("select") +(PARTITION "select" VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +show create table t2; +Table Create Table +t2 CREATE TABLE t2 ( + f1 int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE (f1) +(PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +set sql_mode=default; +show create table t1; +Table Create Table +t1 CREATE TABLE t1 ( + `select` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE (`select`) +(PARTITION `select` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +show create table t2; +Table Create Table +t2 CREATE TABLE t2 ( + f1 int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE (f1) +(PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +set sql_quote_show_create=1; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `select` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE (`select`) +(PARTITION `select` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +show create table t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `f1` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE (`f1`) +(PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +drop table t1, t2; diff --git a/mysql-test/suite/parts/r/rpl_partition.result b/mysql-test/suite/parts/r/rpl_partition.result index 0afe1cb478d..480ab219c34 100644 --- a/mysql-test/suite/parts/r/rpl_partition.result +++ b/mysql-test/suite/parts/r/rpl_partition.result @@ -135,20 +135,20 @@ Create Table CREATE TABLE `t3` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -SUBPARTITION BY HASH (id) + PARTITION BY RANGE (`id`) +SUBPARTITION BY HASH (`id`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION pa2 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION pa3 VALUES LESS THAN (30) ENGINE = InnoDB, - PARTITION pa4 VALUES LESS THAN (40) ENGINE = InnoDB, - PARTITION pa5 VALUES LESS THAN (50) ENGINE = InnoDB, - PARTITION pa6 VALUES LESS THAN (60) ENGINE = InnoDB, - PARTITION pa7 VALUES LESS THAN (70) ENGINE = InnoDB, - PARTITION pa8 VALUES LESS THAN (80) ENGINE = InnoDB, - PARTITION pa9 VALUES LESS THAN (90) ENGINE = InnoDB, - PARTITION pa10 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) +(PARTITION `pa1` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `pa2` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `pa3` VALUES LESS THAN (30) ENGINE = InnoDB, + PARTITION `pa4` VALUES LESS THAN (40) ENGINE = InnoDB, + PARTITION `pa5` VALUES LESS THAN (50) ENGINE = InnoDB, + PARTITION `pa6` VALUES LESS THAN (60) ENGINE = InnoDB, + PARTITION `pa7` VALUES LESS THAN (70) ENGINE = InnoDB, + PARTITION `pa8` VALUES LESS THAN (80) ENGINE = InnoDB, + PARTITION `pa9` VALUES LESS THAN (90) ENGINE = InnoDB, + PARTITION `pa10` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `pa11` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) include/check_slave_is_running.inc SELECT count(*) "Slave norm" FROM t1; Slave norm 500 diff --git a/mysql-test/suite/parts/t/quoting.test b/mysql-test/suite/parts/t/quoting.test new file mode 100644 index 00000000000..4fec9a4f319 --- /dev/null +++ b/mysql-test/suite/parts/t/quoting.test @@ -0,0 +1,19 @@ +# +# MDEV-13089 identifier quoting in partitioning +# +source include/have_partition.inc; +set sql_mode=ansi_quotes; +create table t1 ("select" int) partition by range ("select") (partition "select" values less than maxvalue); +create table t2 (f1 int) partition by range (f1) (partition p1 values less than maxvalue); +show create table t1; +show create table t2; +set sql_quote_show_create=0; +show create table t1; +show create table t2; +set sql_mode=default; +show create table t1; +show create table t2; +set sql_quote_show_create=1; +show create table t1; +show create table t2; +drop table t1, t2; diff --git a/mysql-test/suite/perfschema/r/part_table_io.result b/mysql-test/suite/perfschema/r/part_table_io.result index 1958801d8d2..4f2bd7169d7 100644 --- a/mysql-test/suite/perfschema/r/part_table_io.result +++ b/mysql-test/suite/perfschema/r/part_table_io.result @@ -20,7 +20,7 @@ no_index_tab CREATE TABLE `no_index_tab` ( `a` varchar(255) NOT NULL, `b` int(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (b) + PARTITION BY KEY (`b`) PARTITIONS 2 insert into marker set a = 1; insert into test.no_index_tab set a = 'foo', b = 1; diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result index a07bac9340c..456c1c24f8f 100644 --- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result @@ -662,7 +662,7 @@ t16 CREATE TABLE `t16` ( `c5` char(5) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 *** Show table on Slave **** connection slave; @@ -678,7 +678,7 @@ t16 CREATE TABLE `t16` ( `c7` timestamp NULL DEFAULT current_timestamp(), PRIMARY KEY (`c1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 *** DROP TABLE t16 *** connection master; diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result index 280afed0385..7178a2a78b8 100644 --- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result +++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result @@ -662,7 +662,7 @@ t16 CREATE TABLE `t16` ( `c5` char(5) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 *** Show table on Slave **** connection slave; @@ -678,7 +678,7 @@ t16 CREATE TABLE `t16` ( `c7` timestamp NULL DEFAULT current_timestamp(), PRIMARY KEY (`c1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 *** DROP TABLE t16 *** connection master; diff --git a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result index eef77303c9a..a666ae26c51 100644 --- a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result +++ b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result @@ -121,20 +121,20 @@ Create Table CREATE TABLE `byrange_tbl` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -SUBPARTITION BY HASH (id) + PARTITION BY RANGE (`id`) +SUBPARTITION BY HASH (`id`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION pa2 VALUES LESS THAN (20) ENGINE = InnoDB, - PARTITION pa3 VALUES LESS THAN (30) ENGINE = InnoDB, - PARTITION pa4 VALUES LESS THAN (40) ENGINE = InnoDB, - PARTITION pa5 VALUES LESS THAN (50) ENGINE = InnoDB, - PARTITION pa6 VALUES LESS THAN (60) ENGINE = InnoDB, - PARTITION pa7 VALUES LESS THAN (70) ENGINE = InnoDB, - PARTITION pa8 VALUES LESS THAN (80) ENGINE = InnoDB, - PARTITION pa9 VALUES LESS THAN (90) ENGINE = InnoDB, - PARTITION pa10 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) +(PARTITION `pa1` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `pa2` VALUES LESS THAN (20) ENGINE = InnoDB, + PARTITION `pa3` VALUES LESS THAN (30) ENGINE = InnoDB, + PARTITION `pa4` VALUES LESS THAN (40) ENGINE = InnoDB, + PARTITION `pa5` VALUES LESS THAN (50) ENGINE = InnoDB, + PARTITION `pa6` VALUES LESS THAN (60) ENGINE = InnoDB, + PARTITION `pa7` VALUES LESS THAN (70) ENGINE = InnoDB, + PARTITION `pa8` VALUES LESS THAN (80) ENGINE = InnoDB, + PARTITION `pa9` VALUES LESS THAN (90) ENGINE = InnoDB, + PARTITION `pa10` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `pa11` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT count(*) "Slave norm" FROM test.regular_tbl; Slave norm 500 SELECT count(*) "Slave bykey" FROM test.bykey_tbl; diff --git a/mysql-test/suite/rpl/r/rpl_partition_innodb.result b/mysql-test/suite/rpl/r/rpl_partition_innodb.result index 4657ed7dde5..e9fa13f315b 100644 --- a/mysql-test/suite/rpl/r/rpl_partition_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_partition_innodb.result @@ -62,9 +62,9 @@ byrange_tbl CREATE TABLE `byrange_tbl` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=201 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -(PARTITION pa100 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION paMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`id`) +(PARTITION `pa100` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `paMax` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) show create table test.regular_tbl; Table Create Table regular_tbl CREATE TABLE `regular_tbl` ( @@ -106,9 +106,9 @@ byrange_tbl CREATE TABLE `byrange_tbl` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=201 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -(PARTITION pa100 VALUES LESS THAN (100) ENGINE = InnoDB, - PARTITION paMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`id`) +(PARTITION `pa100` VALUES LESS THAN (100) ENGINE = InnoDB, + PARTITION `paMax` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) show create table test.regular_tbl; Table Create Table regular_tbl CREATE TABLE `regular_tbl` ( diff --git a/mysql-test/suite/rpl/r/rpl_partition_memory.result b/mysql-test/suite/rpl/r/rpl_partition_memory.result index 1d57c48ad78..8dbfd20d260 100644 --- a/mysql-test/suite/rpl/r/rpl_partition_memory.result +++ b/mysql-test/suite/rpl/r/rpl_partition_memory.result @@ -62,9 +62,9 @@ byrange_tbl CREATE TABLE `byrange_tbl` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=MEMORY AUTO_INCREMENT=201 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -(PARTITION pa100 VALUES LESS THAN (100) ENGINE = MEMORY, - PARTITION paMax VALUES LESS THAN MAXVALUE ENGINE = MEMORY) + PARTITION BY RANGE (`id`) +(PARTITION `pa100` VALUES LESS THAN (100) ENGINE = MEMORY, + PARTITION `paMax` VALUES LESS THAN MAXVALUE ENGINE = MEMORY) show create table test.regular_tbl; Table Create Table regular_tbl CREATE TABLE `regular_tbl` ( @@ -106,9 +106,9 @@ byrange_tbl CREATE TABLE `byrange_tbl` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=MEMORY AUTO_INCREMENT=201 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -(PARTITION pa100 VALUES LESS THAN (100) ENGINE = MEMORY, - PARTITION paMax VALUES LESS THAN MAXVALUE ENGINE = MEMORY) + PARTITION BY RANGE (`id`) +(PARTITION `pa100` VALUES LESS THAN (100) ENGINE = MEMORY, + PARTITION `paMax` VALUES LESS THAN MAXVALUE ENGINE = MEMORY) show create table test.regular_tbl; Table Create Table regular_tbl CREATE TABLE `regular_tbl` ( diff --git a/mysql-test/suite/rpl/r/rpl_partition_myisam.result b/mysql-test/suite/rpl/r/rpl_partition_myisam.result index 42ad10c8cf1..16a9ea85832 100644 --- a/mysql-test/suite/rpl/r/rpl_partition_myisam.result +++ b/mysql-test/suite/rpl/r/rpl_partition_myisam.result @@ -62,9 +62,9 @@ byrange_tbl CREATE TABLE `byrange_tbl` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM AUTO_INCREMENT=201 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -(PARTITION pa100 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION paMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`id`) +(PARTITION `pa100` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `paMax` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) show create table test.regular_tbl; Table Create Table regular_tbl CREATE TABLE `regular_tbl` ( @@ -106,9 +106,9 @@ byrange_tbl CREATE TABLE `byrange_tbl` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM AUTO_INCREMENT=201 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -(PARTITION pa100 VALUES LESS THAN (100) ENGINE = MyISAM, - PARTITION paMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`id`) +(PARTITION `pa100` VALUES LESS THAN (100) ENGINE = MyISAM, + PARTITION `paMax` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) show create table test.regular_tbl; Table Create Table regular_tbl CREATE TABLE `regular_tbl` ( diff --git a/mysql-test/suite/rpl/r/rpl_row_basic_8partition.result b/mysql-test/suite/rpl/r/rpl_row_basic_8partition.result index f2774d2fc62..7ced45a9eab 100644 --- a/mysql-test/suite/rpl/r/rpl_row_basic_8partition.result +++ b/mysql-test/suite/rpl/r/rpl_row_basic_8partition.result @@ -28,13 +28,13 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (YEAR(t)) -(PARTITION p0 VALUES LESS THAN (1901) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (1946) ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (1966) ENGINE = MyISAM, - PARTITION p3 VALUES LESS THAN (1986) ENGINE = MyISAM, - PARTITION p4 VALUES LESS THAN (2005) ENGINE = MyISAM, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (year(`t`)) +(PARTITION `p0` VALUES LESS THAN (1901) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (1946) ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN (1966) ENGINE = MyISAM, + PARTITION `p3` VALUES LESS THAN (1986) ENGINE = MyISAM, + PARTITION `p4` VALUES LESS THAN (2005) ENGINE = MyISAM, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) connection slave; SHOW CREATE TABLE t1; Table Create Table @@ -49,13 +49,13 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (YEAR(t)) -(PARTITION p0 VALUES LESS THAN (1901) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (1946) ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (1966) ENGINE = MyISAM, - PARTITION p3 VALUES LESS THAN (1986) ENGINE = MyISAM, - PARTITION p4 VALUES LESS THAN (2005) ENGINE = MyISAM, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (year(`t`)) +(PARTITION `p0` VALUES LESS THAN (1901) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (1946) ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN (1966) ENGINE = MyISAM, + PARTITION `p3` VALUES LESS THAN (1986) ENGINE = MyISAM, + PARTITION `p4` VALUES LESS THAN (2005) ENGINE = MyISAM, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) connection master; "--- Insert into t1 --" as ""; --- Select from t1 on master --- @@ -116,13 +116,13 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (YEAR(t)) -(PARTITION p0 VALUES LESS THAN (1901) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (1946) ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (1966) ENGINE = MyISAM, - PARTITION p3 VALUES LESS THAN (1986) ENGINE = MyISAM, - PARTITION p4 VALUES LESS THAN (2005) ENGINE = MyISAM, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (year(`t`)) +(PARTITION `p0` VALUES LESS THAN (1901) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (1946) ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN (1966) ENGINE = MyISAM, + PARTITION `p3` VALUES LESS THAN (1986) ENGINE = MyISAM, + PARTITION `p4` VALUES LESS THAN (2005) ENGINE = MyISAM, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) connection slave; SHOW CREATE TABLE t1; Table Create Table @@ -137,13 +137,13 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (YEAR(t)) -(PARTITION p0 VALUES LESS THAN (1901) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (1946) ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (1966) ENGINE = MyISAM, - PARTITION p3 VALUES LESS THAN (1986) ENGINE = MyISAM, - PARTITION p4 VALUES LESS THAN (2005) ENGINE = MyISAM, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (year(`t`)) +(PARTITION `p0` VALUES LESS THAN (1901) ENGINE = MyISAM, + PARTITION `p1` VALUES LESS THAN (1946) ENGINE = MyISAM, + PARTITION `p2` VALUES LESS THAN (1966) ENGINE = MyISAM, + PARTITION `p3` VALUES LESS THAN (1986) ENGINE = MyISAM, + PARTITION `p4` VALUES LESS THAN (2005) ENGINE = MyISAM, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) connection master; "--- Insert into t1 --" as ""; --- Select from t1 on master --- @@ -213,10 +213,10 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (id) -(PARTITION p0 VALUES IN (2,4) ENGINE = MyISAM, - PARTITION p1 VALUES IN (42,142) ENGINE = MyISAM, - PARTITION p2 VALUES IN (412) ENGINE = MyISAM) + PARTITION BY LIST (`id`) +(PARTITION `p0` VALUES IN (2,4) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (42,142) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (412) ENGINE = MyISAM) connection slave; SHOW CREATE TABLE t1; Table Create Table @@ -231,10 +231,10 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (id) -(PARTITION p0 VALUES IN (2,4) ENGINE = MyISAM, - PARTITION p1 VALUES IN (42,142) ENGINE = MyISAM, - PARTITION p2 VALUES IN (412) ENGINE = MyISAM) + PARTITION BY LIST (`id`) +(PARTITION `p0` VALUES IN (2,4) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (42,142) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (412) ENGINE = MyISAM) connection master; "--- Insert into t1 --" as ""; --- Select from t1 on master --- @@ -295,10 +295,10 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (id) -(PARTITION p0 VALUES IN (2,4) ENGINE = MyISAM, - PARTITION p1 VALUES IN (42,142) ENGINE = MyISAM, - PARTITION p2 VALUES IN (412) ENGINE = MyISAM) + PARTITION BY LIST (`id`) +(PARTITION `p0` VALUES IN (2,4) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (42,142) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (412) ENGINE = MyISAM) connection slave; SHOW CREATE TABLE t1; Table Create Table @@ -313,10 +313,10 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (id) -(PARTITION p0 VALUES IN (2,4) ENGINE = MyISAM, - PARTITION p1 VALUES IN (42,142) ENGINE = MyISAM, - PARTITION p2 VALUES IN (412) ENGINE = MyISAM) + PARTITION BY LIST (`id`) +(PARTITION `p0` VALUES IN (2,4) ENGINE = MyISAM, + PARTITION `p1` VALUES IN (42,142) ENGINE = MyISAM, + PARTITION `p2` VALUES IN (412) ENGINE = MyISAM) connection master; "--- Insert into t1 --" as ""; --- Select from t1 on master --- @@ -384,7 +384,7 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH ( YEAR(t)) + PARTITION BY HASH (year(`t`)) PARTITIONS 4 connection slave; SHOW CREATE TABLE t1; @@ -400,7 +400,7 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH ( YEAR(t)) + PARTITION BY HASH (year(`t`)) PARTITIONS 4 connection master; "--- Insert into t1 --" as ""; @@ -461,7 +461,7 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH ( YEAR(t)) + PARTITION BY HASH (year(`t`)) PARTITIONS 4 connection slave; SHOW CREATE TABLE t1; @@ -477,7 +477,7 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH ( YEAR(t)) + PARTITION BY HASH (year(`t`)) PARTITIONS 4 connection master; "--- Insert into t1 --" as ""; diff --git a/sql/item.h b/sql/item.h index fc606e766f1..3cb904d3c59 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1298,6 +1298,7 @@ public: - generated columns - check constraints - default value expressions + - partitioning expressions */ void print_for_table_def(String *str) { diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index c3f2d8ec14e..22fa4242ad8 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -990,9 +990,7 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table, result= set_up_field_array(thd, table, is_sub_part); end: end_lex_with_single_table(thd, table, old_lex); -#if !defined(DBUG_OFF) func_expr->walk(&Item::change_context_processor, 0, 0); -#endif DBUG_RETURN(result); } @@ -2254,12 +2252,9 @@ char *generate_partition_syntax(THD *thd, partition_info *part_info, partition_element *part_elem; int err= 0; List_iterator part_it(part_info->partitions); - ulonglong save_options= thd->variables.option_bits; StringBuffer<1024> str; DBUG_ENTER("generate_partition_syntax"); - thd->variables.option_bits&= ~OPTION_QUOTE_SHOW_CREATE; - err+= str.append(STRING_WITH_LEN(" PARTITION BY ")); switch (part_info->part_type) { @@ -2289,7 +2284,7 @@ char *generate_partition_syntax(THD *thd, partition_info *part_info, if (part_info->part_expr) { err+= str.append('('); - err+= str.append(part_info->part_func_string, part_info->part_func_len); + part_info->part_expr->print_for_table_def(&str); err+= str.append(')'); } else if (part_info->column_list) @@ -2319,7 +2314,7 @@ char *generate_partition_syntax(THD *thd, partition_info *part_info, if (part_info->subpart_expr) { err+= str.append('('); - err+= str.append(part_info->subpart_func_string, part_info->subpart_func_len); + part_info->subpart_expr->print_for_table_def(&str); err+= str.append(')'); } if ((!part_info->use_default_num_subpartitions) && @@ -2381,7 +2376,6 @@ char *generate_partition_syntax(THD *thd, partition_info *part_info, err+= str.append(')'); } while (++i < tot_num_parts); } - thd->variables.option_bits= save_options; if (err) DBUG_RETURN(NULL); *buf_length= str.length(); diff --git a/sql/sql_show.cc b/sql/sql_show.cc index d0d253cd911..0e214609291 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -6921,8 +6921,9 @@ static int get_schema_partitions_record(THD *thd, TABLE_LIST *tables, /* Partition expression */ if (part_info->part_expr) { - table->field[9]->store(part_info->part_func_string, - part_info->part_func_len, cs); + StringBuffer str(cs); + part_info->part_expr->print_for_table_def(&str); + table->field[9]->store(str.ptr(), str.length(), str.charset()); } else if (part_info->list_of_part_fields) { @@ -6947,8 +6948,9 @@ static int get_schema_partitions_record(THD *thd, TABLE_LIST *tables, /* Subpartition expression */ if (part_info->subpart_expr) { - table->field[10]->store(part_info->subpart_func_string, - part_info->subpart_func_len, cs); + StringBuffer str(cs); + part_info->subpart_expr->print_for_table_def(&str); + table->field[10]->store(str.ptr(), str.length(), str.charset()); } else if (part_info->list_of_subpart_fields) { diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result index 2aeeda4cfe6..a05ad547a0b 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result @@ -258,7 +258,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`i`), KEY `j` (`j`) ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (i) + PARTITION BY KEY (`i`) PARTITIONS 4 SELECT * FROM t1 ORDER BY i LIMIT 10; i j k diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_crash.result b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_crash.result index 6abc9e61386..d3801258f0c 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_crash.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_crash.result @@ -37,7 +37,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`i`), KEY `j` (`j`) ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (i) + PARTITION BY KEY (`i`) PARTITIONS 4 ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE; SELECT * FROM t1 ORDER BY i LIMIT 10; @@ -72,7 +72,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`i`), KEY `j` (`j`) ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (i) + PARTITION BY KEY (`i`) PARTITIONS 4 ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE; SHOW CREATE TABLE t1; @@ -85,7 +85,7 @@ t1 CREATE TABLE `t1` ( KEY `j` (`j`), KEY `kij` (`i`,`j`) ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (i) + PARTITION BY KEY (`i`) PARTITIONS 4 SELECT COUNT(*) FROM t1; COUNT(*) diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_slave_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_slave_tokudb.result index 6caa51128f9..8906cf31d74 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_slave_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_slave_tokudb.result @@ -662,7 +662,7 @@ t16 CREATE TABLE `t16` ( `c5` char(5) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 *** Show table on Slave **** connection slave; @@ -678,7 +678,7 @@ t16 CREATE TABLE `t16` ( `c7` timestamp NULL DEFAULT current_timestamp(), PRIMARY KEY (`c1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 *** DROP TABLE t16 *** connection master; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_partition_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_partition_tokudb.result index 7b731bc785c..d7e99db1d0e 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_partition_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_partition_tokudb.result @@ -62,9 +62,9 @@ byrange_tbl CREATE TABLE `byrange_tbl` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=TokuDB AUTO_INCREMENT=201 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -(PARTITION pa100 VALUES LESS THAN (100) ENGINE = TokuDB, - PARTITION paMax VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`id`) +(PARTITION `pa100` VALUES LESS THAN (100) ENGINE = TokuDB, + PARTITION `paMax` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) show create table test.regular_tbl; Table Create Table regular_tbl CREATE TABLE `regular_tbl` ( @@ -106,9 +106,9 @@ byrange_tbl CREATE TABLE `byrange_tbl` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=TokuDB AUTO_INCREMENT=201 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -(PARTITION pa100 VALUES LESS THAN (100) ENGINE = TokuDB, - PARTITION paMax VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`id`) +(PARTITION `pa100` VALUES LESS THAN (100) ENGINE = TokuDB, + PARTITION `paMax` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) show create table test.regular_tbl; Table Create Table regular_tbl CREATE TABLE `regular_tbl` ( diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_tokudb_bug28430.result b/storage/tokudb/mysql-test/rpl/r/rpl_tokudb_bug28430.result index 4858d5f099b..c7450a1b9c0 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_tokudb_bug28430.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_tokudb_bug28430.result @@ -115,20 +115,20 @@ Create Table CREATE TABLE `byrange_tbl` ( `filler` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=TokuDB AUTO_INCREMENT=1001 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (id) -SUBPARTITION BY HASH (id) + PARTITION BY RANGE (`id`) +SUBPARTITION BY HASH (`id`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION pa2 VALUES LESS THAN (20) ENGINE = TokuDB, - PARTITION pa3 VALUES LESS THAN (30) ENGINE = TokuDB, - PARTITION pa4 VALUES LESS THAN (40) ENGINE = TokuDB, - PARTITION pa5 VALUES LESS THAN (50) ENGINE = TokuDB, - PARTITION pa6 VALUES LESS THAN (60) ENGINE = TokuDB, - PARTITION pa7 VALUES LESS THAN (70) ENGINE = TokuDB, - PARTITION pa8 VALUES LESS THAN (80) ENGINE = TokuDB, - PARTITION pa9 VALUES LESS THAN (90) ENGINE = TokuDB, - PARTITION pa10 VALUES LESS THAN (100) ENGINE = TokuDB, - PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = TokuDB) +(PARTITION `pa1` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `pa2` VALUES LESS THAN (20) ENGINE = TokuDB, + PARTITION `pa3` VALUES LESS THAN (30) ENGINE = TokuDB, + PARTITION `pa4` VALUES LESS THAN (40) ENGINE = TokuDB, + PARTITION `pa5` VALUES LESS THAN (50) ENGINE = TokuDB, + PARTITION `pa6` VALUES LESS THAN (60) ENGINE = TokuDB, + PARTITION `pa7` VALUES LESS THAN (70) ENGINE = TokuDB, + PARTITION `pa8` VALUES LESS THAN (80) ENGINE = TokuDB, + PARTITION `pa9` VALUES LESS THAN (90) ENGINE = TokuDB, + PARTITION `pa10` VALUES LESS THAN (100) ENGINE = TokuDB, + PARTITION `pa11` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) SELECT count(*) "Slave norm" FROM test.regular_tbl; Slave norm 500 SELECT count(*) "Slave bykey" FROM test.bykey_tbl; diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result index 714b0d861c0..29d2be47f1c 100644 --- a/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result +++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result @@ -10,7 +10,7 @@ foo CREATE TABLE `foo` ( `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 2 ALTER TABLE foo ADD KEY(b); SHOW CREATE TABLE foo; @@ -21,6 +21,6 @@ foo CREATE TABLE `foo` ( PRIMARY KEY (`a`), KEY `b` (`b`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 2 DROP TABLE foo; diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result index f8562bfc25c..99f87aec225 100644 --- a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result +++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result @@ -9,7 +9,7 @@ foo CREATE TABLE `foo` ( `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 2 ALTER TABLE foo ADD COLUMN c INT; SHOW CREATE TABLE foo; @@ -20,6 +20,6 @@ foo CREATE TABLE `foo` ( `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 2 DROP TABLE foo; diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter3_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter3_tokudb.result index 1aa7b778aae..1a958e8a6b9 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter3_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter3_tokudb.result @@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) + PARTITION BY HASH (year(`f_date`)) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -95,7 +95,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFYEAR(f_date)) + PARTITION BY HASH (dayofyear(`f_date`)) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -111,7 +111,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) + PARTITION BY HASH (year(`f_date`)) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -133,10 +133,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -156,11 +156,11 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -177,15 +177,15 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB, - PARTITION p4 ENGINE = TokuDB, - PARTITION p5 ENGINE = TokuDB, - PARTITION p6 ENGINE = TokuDB, - PARTITION p7 ENGINE = TokuDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB, + PARTITION `p4` ENGINE = TokuDB, + PARTITION `p5` ENGINE = TokuDB, + PARTITION `p6` ENGINE = TokuDB, + PARTITION `p7` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -214,14 +214,14 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB, - PARTITION p4 ENGINE = TokuDB, - PARTITION p5 ENGINE = TokuDB, - PARTITION p6 ENGINE = TokuDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB, + PARTITION `p4` ENGINE = TokuDB, + PARTITION `p5` ENGINE = TokuDB, + PARTITION `p6` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -237,13 +237,13 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB, - PARTITION p4 ENGINE = TokuDB, - PARTITION p5 ENGINE = TokuDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB, + PARTITION `p4` ENGINE = TokuDB, + PARTITION `p5` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -259,12 +259,12 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB, - PARTITION p4 ENGINE = TokuDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB, + PARTITION `p4` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -280,11 +280,11 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -300,10 +300,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -319,9 +319,9 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -337,8 +337,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(f_date)) -(PARTITION p0 ENGINE = TokuDB) + PARTITION BY HASH (year(`f_date`)) +(PARTITION `p0` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; @@ -420,7 +420,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`) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; @@ -445,10 +445,10 @@ 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 p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; @@ -468,11 +468,11 @@ 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 p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; @@ -492,15 +492,15 @@ 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 p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB, - PARTITION p4 ENGINE = TokuDB, - PARTITION p5 ENGINE = TokuDB, - PARTITION p6 ENGINE = TokuDB, - PARTITION p7 ENGINE = TokuDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB, + PARTITION `p4` ENGINE = TokuDB, + PARTITION `p5` ENGINE = TokuDB, + PARTITION `p6` ENGINE = TokuDB, + PARTITION `p7` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; @@ -527,14 +527,14 @@ 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 p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB, - PARTITION p4 ENGINE = TokuDB, - PARTITION p5 ENGINE = TokuDB, - PARTITION p6 ENGINE = TokuDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB, + PARTITION `p4` ENGINE = TokuDB, + PARTITION `p5` ENGINE = TokuDB, + PARTITION `p6` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; @@ -553,13 +553,13 @@ 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 p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB, - PARTITION p4 ENGINE = TokuDB, - PARTITION p5 ENGINE = TokuDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB, + PARTITION `p4` ENGINE = TokuDB, + PARTITION `p5` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; @@ -578,12 +578,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 p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB, - PARTITION p4 ENGINE = TokuDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB, + PARTITION `p4` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; @@ -602,11 +602,11 @@ 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 p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; @@ -625,10 +625,10 @@ 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 p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB, - PARTITION part7 ENGINE = TokuDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB, + PARTITION `part7` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; @@ -647,9 +647,9 @@ 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 p0 ENGINE = TokuDB, - PARTITION part1 ENGINE = TokuDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = TokuDB, + PARTITION `part1` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; @@ -668,8 +668,8 @@ 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 p0 ENGINE = TokuDB) + PARTITION BY KEY (`f_int1`) +(PARTITION `p0` ENGINE = TokuDB) t1.frm t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_auto_increment_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_auto_increment_tokudb.result index 3207e5fda86..b18f970d2ce 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_auto_increment_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_auto_increment_tokudb.result @@ -189,7 +189,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -413,7 +413,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=27 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -426,7 +426,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -444,7 +444,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=102 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; # Test with two threads @@ -715,7 +715,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (4); SHOW CREATE TABLE t1; @@ -724,7 +724,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=15 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -733,7 +733,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -742,7 +742,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -758,7 +758,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (0); SHOW CREATE TABLE t1; @@ -767,7 +767,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -776,7 +776,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=302 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 @@ -799,7 +799,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -808,7 +808,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 @@ -820,7 +820,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 (c1) VALUES (NULL); SHOW CREATE TABLE t1; @@ -829,7 +829,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=24 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SET INSERT_ID = 22; INSERT INTO t1 VALUES (NULL), (NULL), (NULL); @@ -853,7 +853,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 FLUSH TABLE; SHOW CREATE TABLE t1; @@ -862,7 +862,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (4); FLUSH TABLE; @@ -872,7 +872,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 INSERT INTO t1 VALUES (NULL); FLUSH TABLE; @@ -882,7 +882,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) ) ENGINE=TokuDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1 ORDER BY c1; c1 diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_bit_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_bit_tokudb.result index cfd8155caf1..5cde7dd065e 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_bit_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_bit_tokudb.result @@ -9,7 +9,7 @@ t1 CREATE TABLE `t1` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) drop table t1; create table t1 (a bit(0), primary key (a)) engine='TOKUDB' partition by key (a) ( @@ -21,9 +21,9 @@ t1 CREATE TABLE `t1` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 ENGINE = TokuDB, - PARTITION pa2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` ENGINE = TokuDB, + PARTITION `pa2` ENGINE = TokuDB) drop table t1; create table t1 (a bit(64), primary key (a)) engine='TOKUDB' partition by key (a) partitions 2; @@ -33,7 +33,7 @@ t1 CREATE TABLE `t1` ( `a` bit(64) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 2 insert into t1 values (b'1111111111111111111111111111111111111111111111111111111111111111'), @@ -61,11 +61,11 @@ t1 CREATE TABLE `t1` ( `a` bit(64) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values (b'1111111111111111111111111111111111111111111111111111111111111111'), (b'1000000000000000000000000000000000000000000000000000000000000000'), @@ -91,7 +91,7 @@ t2 CREATE TABLE `t2` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 4 insert into t2 values (b'0'), (b'1'); select hex(a) from t2; @@ -104,7 +104,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `a` bit(1) NOT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 4 select hex(a) from t2; hex(a) @@ -117,7 +117,7 @@ t2 CREATE TABLE `t2` ( `a` bit(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 4 select hex(a) from t2; hex(a) @@ -136,13 +136,13 @@ t3 CREATE TABLE `t3` ( `a` bit(8) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (`a`) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES LESS THAN (3) ENGINE = TokuDB, - PARTITION pa2 VALUES LESS THAN (16) ENGINE = TokuDB, - PARTITION pa3 VALUES LESS THAN (64) ENGINE = TokuDB, - PARTITION pa4 VALUES LESS THAN (256) ENGINE = TokuDB) +(PARTITION `pa1` VALUES LESS THAN (3) ENGINE = TokuDB, + PARTITION `pa2` VALUES LESS THAN (16) ENGINE = TokuDB, + PARTITION `pa3` VALUES LESS THAN (64) ENGINE = TokuDB, + PARTITION `pa4` VALUES LESS THAN (256) ENGINE = TokuDB) 255 inserts; select hex(a) from t3 where a=b'01010101'; hex(a) @@ -419,12 +419,12 @@ t4 CREATE TABLE `t4` ( `a` bit(8) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (`a`) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa1 VALUES IN (0,1,2,3) ENGINE = TokuDB, - PARTITION pa2 VALUES IN (4,5,6,7,8,9,10,11,12,13,14,15,16) ENGINE = TokuDB, - PARTITION pa3 VALUES IN (17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32) ENGINE = TokuDB) +(PARTITION `pa1` VALUES IN (0,1,2,3) ENGINE = TokuDB, + PARTITION `pa2` VALUES IN (4,5,6,7,8,9,10,11,12,13,14,15,16) ENGINE = TokuDB, + PARTITION `pa3` VALUES IN (17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32) ENGINE = TokuDB) 32 inserts; select hex(a) from t4 where a=b'00000001'; hex(a) diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_char_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_char_tokudb.result index 0d206906df3ee5378d9e1b2777bb6a2d0a3bbd89..86686296b810efdf639b3bb25e20f4e638c8685c 100644 GIT binary patch delta 441 zcmaFV&b+FFdBagg(S*bVO)iZ9$Dk0;5Kn(Ug@l4c!-UC&f)=bmmQliFK_)QEIAQX~ zO<5YG@#e?NtSM8nCAf)>mLiAIwhqd~MWkd~V4zgZ5* zHrYIpX$vc3;^c&krIR19IZi&n!oS&;Q=fx0QzlPj>fC%#h*Jn`lE-FI)mx?{o8Z5h zD<+tSF>!N3Mz<7My8XE)hd266?qlbkyrzF6$fOBZNH@u4v&$MTW}xoC^`XopyTfJk Nw$1S%-4fe{cmZL*finOA diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_datetime_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_datetime_tokudb.result index 58a82b8f684..0bbd8bd75cc 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_datetime_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_datetime_tokudb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59'); select * from t1; a @@ -40,7 +40,7 @@ t2 CREATE TABLE `t2` ( `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16'); select * from t2; @@ -137,11 +137,11 @@ t1 CREATE TABLE `t1` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15'); select * from t1; a @@ -167,7 +167,7 @@ t2 CREATE TABLE `t2` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15'); select * from t2; @@ -291,13 +291,13 @@ t3 CREATE TABLE `t3` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION quarter2 VALUES LESS THAN (7) ENGINE = TokuDB, - PARTITION quarter3 VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION quarter4 VALUES LESS THAN (13) ENGINE = TokuDB) +(PARTITION `quarter1` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `quarter2` VALUES LESS THAN (7) ENGINE = TokuDB, + PARTITION `quarter3` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `quarter4` VALUES LESS THAN (13) ENGINE = TokuDB) 12 inserts; select count(*) from t3; count(*) @@ -331,13 +331,13 @@ t4 CREATE TABLE `t4` ( `a` date NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES IN (1,2,3) ENGINE = TokuDB, - PARTITION quarter2 VALUES IN (4,5,6) ENGINE = TokuDB, - PARTITION quarter3 VALUES IN (7,8,9) ENGINE = TokuDB, - PARTITION quarter4 VALUES IN (10,11,12) ENGINE = TokuDB) +(PARTITION `quarter1` VALUES IN (1,2,3) ENGINE = TokuDB, + PARTITION `quarter2` VALUES IN (4,5,6) ENGINE = TokuDB, + PARTITION `quarter3` VALUES IN (7,8,9) ENGINE = TokuDB, + PARTITION `quarter4` VALUES IN (10,11,12) ENGINE = TokuDB) 12 inserts; select count(*) from t4; count(*) @@ -369,11 +369,11 @@ t1 CREATE TABLE `t1` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values ('21:21:21'), ('12:10:30'), ('03:03:03'), ('23:59'); select * from t1; a @@ -399,7 +399,7 @@ t2 CREATE TABLE `t2` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('0:1:1'), ('10:11:12'), ('13:14:15'), ('14:15:16'); select * from t2; @@ -498,13 +498,13 @@ t3 CREATE TABLE `t3` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (second(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (second(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES LESS THAN (16) ENGINE = TokuDB, - PARTITION quarter2 VALUES LESS THAN (31) ENGINE = TokuDB, - PARTITION quarter3 VALUES LESS THAN (46) ENGINE = TokuDB, - PARTITION quarter4 VALUES LESS THAN (61) ENGINE = TokuDB) +(PARTITION `quarter1` VALUES LESS THAN (16) ENGINE = TokuDB, + PARTITION `quarter2` VALUES LESS THAN (31) ENGINE = TokuDB, + PARTITION `quarter3` VALUES LESS THAN (46) ENGINE = TokuDB, + PARTITION `quarter4` VALUES LESS THAN (61) ENGINE = TokuDB) 59 inserts; select count(*) from t3; count(*) @@ -585,13 +585,13 @@ t4 CREATE TABLE `t4` ( `a` time NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (second(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (second(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES IN (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ENGINE = TokuDB, - PARTITION quarter2 VALUES IN (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB, - PARTITION quarter3 VALUES IN (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45) ENGINE = TokuDB, - PARTITION quarter4 VALUES IN (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB) +(PARTITION `quarter1` VALUES IN (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ENGINE = TokuDB, + PARTITION `quarter2` VALUES IN (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30) ENGINE = TokuDB, + PARTITION `quarter3` VALUES IN (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45) ENGINE = TokuDB, + PARTITION `quarter4` VALUES IN (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60) ENGINE = TokuDB) 59 inserts; select count(*) from t4; count(*) @@ -670,11 +670,11 @@ t1 CREATE TABLE `t1` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59'); select * from t1; a @@ -700,7 +700,7 @@ t2 CREATE TABLE `t2` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16'); select * from t2; @@ -799,13 +799,13 @@ t3 CREATE TABLE `t3` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION quarter2 VALUES LESS THAN (7) ENGINE = TokuDB, - PARTITION quarter3 VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION quarter4 VALUES LESS THAN (13) ENGINE = TokuDB) +(PARTITION `quarter1` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `quarter2` VALUES LESS THAN (7) ENGINE = TokuDB, + PARTITION `quarter3` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `quarter4` VALUES LESS THAN (13) ENGINE = TokuDB) 12 inserts; select count(*) from t3; count(*) @@ -839,13 +839,13 @@ t4 CREATE TABLE `t4` ( `a` datetime NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (month(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (month(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 3 -(PARTITION quarter1 VALUES IN (1,2,3) ENGINE = TokuDB, - PARTITION quarter2 VALUES IN (4,5,6) ENGINE = TokuDB, - PARTITION quarter3 VALUES IN (7,8,9) ENGINE = TokuDB, - PARTITION quarter4 VALUES IN (10,11,12) ENGINE = TokuDB) +(PARTITION `quarter1` VALUES IN (1,2,3) ENGINE = TokuDB, + PARTITION `quarter2` VALUES IN (4,5,6) ENGINE = TokuDB, + PARTITION `quarter3` VALUES IN (7,8,9) ENGINE = TokuDB, + PARTITION `quarter4` VALUES IN (10,11,12) ENGINE = TokuDB) 12 inserts; select count(*) from t4; count(*) @@ -877,11 +877,11 @@ t1 CREATE TABLE `t1` ( `a` year(4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values ('1975'), (2020), ('1980'), ('2000'); select * from t1; a @@ -907,7 +907,7 @@ t2 CREATE TABLE `t2` ( `a` year(4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 12 insert into t2 values ('1975'), ('2020'), ('1980'), ('2000'); select * from t2; diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_sync_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_sync_tokudb.result index 98eba1276c8..7186da6f69a 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_sync_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_sync_tokudb.result @@ -56,8 +56,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) t1.frm t1.par SET DEBUG_SYNC='before_open_in_get_all_tables SIGNAL parked WAIT_FOR open'; @@ -90,9 +90,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION p10 VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `p10` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) SELECT * FROM t1; a 1 diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_decimal_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_decimal_tokudb.result index 7ec843191e9..6dfeda71b48 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_decimal_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_decimal_tokudb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` decimal(10,4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values (999999.9999), (-999999.9999), (123456.7899), (-123456.7899), (-1.5), (1), (0), (-1), (1.5), (1234.567), (-1234.567); select * from t1; a @@ -54,7 +54,7 @@ t2 CREATE TABLE `t2` ( `a` decimal(18,9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 10 insert into t2 values (999999999.999999999), (-999999999.999999999), (-1.5), (-1), (0), (1.5), (1234.567), (-1234.567); select * from t2; @@ -100,14 +100,14 @@ t3 CREATE TABLE `t3` ( `a` decimal(18,9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (floor(a)) -SUBPARTITION BY KEY (a) + PARTITION BY RANGE (floor(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa2 VALUES LESS THAN (2) ENGINE = TokuDB, - PARTITION pa4 VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION pa6 VALUES LESS THAN (6) ENGINE = TokuDB, - PARTITION pa8 VALUES LESS THAN (8) ENGINE = TokuDB, - PARTITION pa10 VALUES LESS THAN (10) ENGINE = TokuDB) +(PARTITION `pa2` VALUES LESS THAN (2) ENGINE = TokuDB, + PARTITION `pa4` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `pa6` VALUES LESS THAN (6) ENGINE = TokuDB, + PARTITION `pa8` VALUES LESS THAN (8) ENGINE = TokuDB, + PARTITION `pa10` VALUES LESS THAN (10) ENGINE = TokuDB) 9*3 inserts; select count(*) from t3; count(*) @@ -127,14 +127,14 @@ t4 CREATE TABLE `t4` ( `a` decimal(18,9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (ceiling(a)) -SUBPARTITION BY KEY (a) + PARTITION BY LIST (ceiling(`a`)) +SUBPARTITION BY KEY (`a`) SUBPARTITIONS 2 -(PARTITION pa2 VALUES IN (1,2) ENGINE = TokuDB, - PARTITION pa4 VALUES IN (3,4) ENGINE = TokuDB, - PARTITION pa6 VALUES IN (5,6) ENGINE = TokuDB, - PARTITION pa8 VALUES IN (7,8) ENGINE = TokuDB, - PARTITION pa10 VALUES IN (9,10) ENGINE = TokuDB) +(PARTITION `pa2` VALUES IN (1,2) ENGINE = TokuDB, + PARTITION `pa4` VALUES IN (3,4) ENGINE = TokuDB, + PARTITION `pa6` VALUES IN (5,6) ENGINE = TokuDB, + PARTITION `pa8` VALUES IN (7,8) ENGINE = TokuDB, + PARTITION `pa10` VALUES IN (9,10) ENGINE = TokuDB) 9*3 inserts; select count(*) from t4; count(*) diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_engine_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_engine_tokudb.result index c14e895f8f2..a921ba0f56d 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_engine_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_engine_tokudb.result @@ -68,7 +68,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 @@ -525,9 +525,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 part1 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -984,14 +984,14 @@ 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_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = TokuDB, - SUBPARTITION subpart12 ENGINE = TokuDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = TokuDB, - SUBPARTITION subpart22 ENGINE = TokuDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = TokuDB, + SUBPARTITION `subpart12` ENGINE = TokuDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = TokuDB, + SUBPARTITION `subpart22` ENGINE = TokuDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1509,14 +1509,14 @@ 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_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = TokuDB, - SUBPARTITION subpart12 ENGINE = TokuDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = TokuDB, - SUBPARTITION subpart22 ENGINE = TokuDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = TokuDB, + SUBPARTITION `subpart12` ENGINE = TokuDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = TokuDB, + SUBPARTITION `subpart22` ENGINE = TokuDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2010,14 +2010,14 @@ 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_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = TokuDB, - SUBPARTITION subpart12 ENGINE = TokuDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = TokuDB, - SUBPARTITION subpart22 ENGINE = TokuDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = TokuDB, + SUBPARTITION `subpart12` ENGINE = TokuDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = TokuDB, + SUBPARTITION `subpart22` ENGINE = TokuDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2472,14 +2472,14 @@ 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_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = TokuDB, - SUBPARTITION subpart12 ENGINE = TokuDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = TokuDB, - SUBPARTITION subpart22 ENGINE = TokuDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = TokuDB, + SUBPARTITION `subpart12` ENGINE = TokuDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = TokuDB, + SUBPARTITION `subpart22` ENGINE = TokuDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2934,9 +2934,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 part1 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3393,14 +3393,14 @@ 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_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = TokuDB, - SUBPARTITION subpart12 ENGINE = TokuDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = TokuDB, - SUBPARTITION subpart22 ENGINE = TokuDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = TokuDB, + SUBPARTITION `subpart12` ENGINE = TokuDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = TokuDB, + SUBPARTITION `subpart22` ENGINE = TokuDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3858,14 +3858,14 @@ 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_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = TokuDB, - SUBPARTITION subpart12 ENGINE = TokuDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = TokuDB, - SUBPARTITION subpart22 ENGINE = TokuDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = TokuDB, + SUBPARTITION `subpart12` ENGINE = TokuDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = TokuDB, + SUBPARTITION `subpart22` ENGINE = TokuDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4316,8 +4316,8 @@ 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 part1 ENGINE = TokuDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = TokuDB) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4770,11 +4770,11 @@ 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_int1) -(PARTITION part1 VALUES LESS THAN (1000) - (SUBPARTITION subpart11 ENGINE = TokuDB, - SUBPARTITION subpart12 ENGINE = TokuDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (1000) + (SUBPARTITION `subpart11` ENGINE = TokuDB, + SUBPARTITION `subpart12` ENGINE = TokuDB)) # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_1_tokudb.result index da13bf5bc5b..8f3d888a5a3 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_1_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_1_tokudb.result @@ -128,10 +128,10 @@ tp CREATE TABLE `tp` ( PRIMARY KEY (`a`), UNIQUE KEY `a` (`a`) USING BTREE ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION p1 VALUES LESS THAN (100) ENGINE = TokuDB, - PARTITION p2 VALUES LESS THAN (1000) ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `p1` VALUES LESS THAN (100) ENGINE = TokuDB, + PARTITION `p2` VALUES LESS THAN (1000) ENGINE = TokuDB) ALTER TABLE tp DROP INDEX a; ALTER TABLE t_10 DROP INDEX a; ALTER TABLE tp ADD UNIQUE INDEX USING BTREE (a,b); @@ -153,10 +153,10 @@ tp CREATE TABLE `tp` ( PRIMARY KEY (`a`), UNIQUE KEY `a` (`a`,`b`) USING BTREE ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION p1 VALUES LESS THAN (100) ENGINE = TokuDB, - PARTITION p2 VALUES LESS THAN (1000) ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `p1` VALUES LESS THAN (100) ENGINE = TokuDB, + PARTITION `p2` VALUES LESS THAN (1000) ENGINE = TokuDB) DROP TABLE IF EXISTS t_10; DROP TABLE IF EXISTS t_100; DROP TABLE IF EXISTS t_1000; diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_exchange_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exchange_tokudb.result index 11c75321b4b..b3cc206e854 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_exchange_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exchange_tokudb.result @@ -13,7 +13,7 @@ tp CREATE TABLE `tp` ( `b` varchar(24) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 4 SHOW CREATE TABLE t; Table Create Table @@ -86,7 +86,7 @@ tp CREATE TABLE `tp` ( `b` varchar(24) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB AUTO_INCREMENT=112 DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 4 SHOW CREATE TABLE t; Table Create Table @@ -194,9 +194,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = TokuDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = TokuDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) SET DEBUG_SYNC= 'now SIGNAL goto_verification'; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # select from t and select/update/delete/insert from tp should work @@ -237,9 +237,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = TokuDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = TokuDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) SET DEBUG_SYNC= 'now SIGNAL goto_wait'; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # Both tables should now be under exclusive lock, even SHOW should fail @@ -312,9 +312,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = TokuDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = TokuDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) SELECT * FROM tp WHERE a = 99; a b 99 End of values @@ -346,9 +346,9 @@ tp CREATE TABLE `tp` ( `b` varchar(55) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = TokuDB, - PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = TokuDB, + PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) SELECT * FROM t; a b 10 Ten diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_float_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_float_tokudb.result index 4f75249a21c..41cf88139ed 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_float_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_float_tokudb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` float NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values (-3.402823466E+38), (3.402823466E+38), (-1.5), (-1), (0), (1), (1.5); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` float NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 10 insert into t2 values (-3.402823466E+38), (-3.402823466E+37), (-123.456), (0), (1234546.789), (123.456), (1.5); select * from t2; @@ -100,11 +100,11 @@ t1 CREATE TABLE `t1` ( `a` double NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208); select * from t1; a @@ -138,7 +138,7 @@ t2 CREATE TABLE `t2` ( `a` double NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 10 insert into t2 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208); select * from t2; diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_int_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_int_tokudb.result index 581b5a72a0e..87ad2fc16f2 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_int_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_int_tokudb.result @@ -10,11 +10,11 @@ t1 CREATE TABLE `t1` ( `a` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values (255), (254), (253), (252), (1), (2), (128); select * from t1; a @@ -46,7 +46,7 @@ t2 CREATE TABLE `t2` ( `a` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (255), (254), (253), (252); select * from t2; @@ -78,7 +78,7 @@ t3 CREATE TABLE `t3` ( `a` tinyint(4) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (127), (126), (125), (124), (-128), (-127), (1), (-1), (0); select * from t3; @@ -119,11 +119,11 @@ t1 CREATE TABLE `t1` ( `a` smallint(5) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values (65535), (65534), (65533), (65532), (1), (2), (256); select * from t1; a @@ -155,7 +155,7 @@ t2 CREATE TABLE `t2` ( `a` smallint(5) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (65535), (65534), (65533), (65532); select * from t2; @@ -187,7 +187,7 @@ t3 CREATE TABLE `t3` ( `a` smallint(6) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (32767), (32766), (32765), (32764), (-32768), (-32767), (1), (-1), (0); select * from t3; @@ -228,11 +228,11 @@ t1 CREATE TABLE `t1` ( `a` int(10) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values (4294967295), (4294967294), (4294967293), (4294967292), (1), (2), (65535); select * from t1; a @@ -264,7 +264,7 @@ t2 CREATE TABLE `t2` ( `a` int(10) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (4294967295), (4294967294), (4294967293), (4294967292); select * from t2; @@ -296,7 +296,7 @@ t3 CREATE TABLE `t3` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (2147483647), (2147483646), (2147483645), (2147483644), (-2147483648), (-2147483647), (1), (-1), (0); select * from t3; @@ -337,11 +337,11 @@ t1 CREATE TABLE `t1` ( `a` mediumint(8) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values (16777215), (16777214), (16777213), (16777212), (1), (2), (65535); select * from t1; a @@ -373,7 +373,7 @@ t2 CREATE TABLE `t2` ( `a` mediumint(8) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (16777215), (16777214), (16777213), (16777212); select * from t2; @@ -405,7 +405,7 @@ t3 CREATE TABLE `t3` ( `a` mediumint(9) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (8388607), (8388606), (8388605), (8388604), (-8388608), (-8388607), (1), (-1), (0); select * from t3; @@ -446,11 +446,11 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612), (1), (2), (65535); select * from t1; a @@ -494,7 +494,7 @@ t2 CREATE TABLE `t2` ( `a` bigint(20) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 8 insert into t2 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612); select * from t2; @@ -526,7 +526,7 @@ t3 CREATE TABLE `t3` ( `a` bigint(20) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) + PARTITION BY KEY (`a`) PARTITIONS 7 insert into t3 values (9223372036854775807), (9223372036854775806), (9223372036854775805), (9223372036854775804), (-9223372036854775808), (-9223372036854775807), (1), (-1), (0); select * from t3; diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc0_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc0_tokudb.result index 7ee2018a661..4c30d47f526 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc0_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc0_tokudb.result @@ -56,14 +56,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB, - PARTITION PartD ENGINE = TokuDB, - PARTITION partE ENGINE = TokuDB, - PARTITION Partf ENGINE = TokuDB, - PARTITION PartG ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB, + PARTITION `PartD` ENGINE = TokuDB, + PARTITION `partE` ENGINE = TokuDB, + PARTITION `Partf` ENGINE = TokuDB, + PARTITION `PartG` ENGINE = TokuDB) 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) SELECT * FROM TableB; a 10 @@ -156,10 +156,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = TokuDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = TokuDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -271,11 +271,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB, - PARTITION PartD ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB, + PARTITION `PartD` ENGINE = TokuDB) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -364,14 +364,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB, - PARTITION PartD ENGINE = TokuDB, - PARTITION partE ENGINE = TokuDB, - PARTITION Partf ENGINE = TokuDB, - PARTITION PartG ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB, + PARTITION `PartD` ENGINE = TokuDB, + PARTITION `partE` ENGINE = TokuDB, + PARTITION `Partf` ENGINE = TokuDB, + PARTITION `PartG` ENGINE = TokuDB) ALTER TABLE TableA COALESCE PARTITION 4; SELECT * FROM TableA; a @@ -392,10 +392,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # Test of REORGANIZE PARTITIONS # Should not work on HASH/KEY ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO @@ -428,10 +428,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = TokuDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = TokuDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -507,11 +507,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB, - PARTITION PartD ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB, + PARTITION `PartD` ENGINE = TokuDB) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -589,14 +589,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (7) ENGINE = TokuDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION PartD VALUES LESS THAN (13) ENGINE = TokuDB, - PARTITION partE VALUES LESS THAN (16) ENGINE = TokuDB, - PARTITION Partf VALUES LESS THAN (19) ENGINE = TokuDB, - PARTITION PartG VALUES LESS THAN (22) ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = TokuDB, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = TokuDB, + PARTITION `partE` VALUES LESS THAN (16) ENGINE = TokuDB, + PARTITION `Partf` VALUES LESS THAN (19) ENGINE = TokuDB, + PARTITION `PartG` VALUES LESS THAN (22) ENGINE = TokuDB) ALTER TABLE TableA DROP PARTITION partE, PartG; ALTER TABLE TableA DROP PARTITION Partf; ALTER TABLE TableA ADD PARTITION @@ -620,12 +620,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (7) ENGINE = TokuDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION PartD VALUES LESS THAN (13) ENGINE = TokuDB, - PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = TokuDB, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = TokuDB, + PARTITION `PartE` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) # Test of REORGANIZE PARTITIONS # Error since it must reorganize a consecutive range ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO @@ -658,11 +658,11 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = TokuDB, - PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = TokuDB, + PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = TokuDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -738,11 +738,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (7) ENGINE = TokuDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION PartD VALUES LESS THAN (13) ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = TokuDB, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = TokuDB) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -820,14 +820,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = TokuDB, - PARTITION partB VALUES IN (2,10,11) ENGINE = TokuDB, - PARTITION Partc VALUES IN (3,4,7) ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB, - PARTITION partE VALUES IN (16) ENGINE = TokuDB, - PARTITION Partf VALUES IN (19) ENGINE = TokuDB, - PARTITION PartG VALUES IN (22) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = TokuDB, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = TokuDB, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB, + PARTITION `partE` VALUES IN (16) ENGINE = TokuDB, + PARTITION `Partf` VALUES IN (19) ENGINE = TokuDB, + PARTITION `PartG` VALUES IN (22) ENGINE = TokuDB) ALTER TABLE TableA DROP PARTITION partE, PartG; ALTER TABLE TableA DROP PARTITION Partf; ALTER TABLE TableA ADD PARTITION @@ -851,12 +851,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = TokuDB, - PARTITION partB VALUES IN (2,10,11) ENGINE = TokuDB, - PARTITION Partc VALUES IN (3,4,7) ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB, - PARTITION PartE VALUES IN (13) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = TokuDB, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = TokuDB, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB, + PARTITION `PartE` VALUES IN (13) ENGINE = TokuDB) # Test of REORGANIZE PARTITIONS ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO (PARTITION Partc VALUES IN (1,7) @@ -889,12 +889,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = TokuDB, - PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = TokuDB, - PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB, - PARTITION PartE VALUES IN (13) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = TokuDB, + PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = TokuDB, + PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB, + PARTITION `PartE` VALUES IN (13) ENGINE = TokuDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -961,11 +961,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = TokuDB, - PARTITION partB VALUES IN (2,10,11) ENGINE = TokuDB, - PARTITION Partc VALUES IN (3,4,7) ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = TokuDB, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = TokuDB, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -1004,10 +1004,10 @@ t1 CREATE TABLE `t1` ( `b` varchar(255) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB AUTO_INCREMENT=2002 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION LT1000 VALUES LESS THAN (1000) ENGINE = TokuDB, - PARTITION LT2000 VALUES LESS THAN (2000) ENGINE = TokuDB, - PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `LT1000` VALUES LESS THAN (1000) ENGINE = TokuDB, + PARTITION `LT2000` VALUES LESS THAN (2000) ENGINE = TokuDB, + PARTITION `MAX` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) SELECT * FROM t1 ORDER BY a; a b 1 First diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc10_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc10_tokudb.result index 28aa690fea4..6ccd9afefab 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc10_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc10_tokudb.result @@ -56,14 +56,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB, - PARTITION PartD ENGINE = TokuDB, - PARTITION partE ENGINE = TokuDB, - PARTITION Partf ENGINE = TokuDB, - PARTITION PartG ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB, + PARTITION `PartD` ENGINE = TokuDB, + PARTITION `partE` ENGINE = TokuDB, + PARTITION `Partf` ENGINE = TokuDB, + PARTITION `PartG` ENGINE = TokuDB) 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # Test of EXCHANGE PARTITION WITH TABLE # Test of REORGANIZE PARTITIONS # Should not work on HASH/KEY @@ -121,10 +121,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = TokuDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = TokuDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -200,11 +200,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB, - PARTITION PartD ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB, + PARTITION `PartD` ENGINE = TokuDB) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -293,14 +293,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB, - PARTITION PartD ENGINE = TokuDB, - PARTITION partE ENGINE = TokuDB, - PARTITION Partf ENGINE = TokuDB, - PARTITION PartG ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB, + PARTITION `PartD` ENGINE = TokuDB, + PARTITION `partE` ENGINE = TokuDB, + PARTITION `Partf` ENGINE = TokuDB, + PARTITION `PartG` ENGINE = TokuDB) ALTER TABLE TableA COALESCE PARTITION 4; SELECT * FROM TableA; a @@ -321,10 +321,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # Test of REORGANIZE PARTITIONS # Should not work on HASH/KEY ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO @@ -357,10 +357,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = TokuDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = TokuDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -436,11 +436,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB, - PARTITION PartD ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB, + PARTITION `PartD` ENGINE = TokuDB) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -518,14 +518,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (7) ENGINE = TokuDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION PartD VALUES LESS THAN (13) ENGINE = TokuDB, - PARTITION partE VALUES LESS THAN (16) ENGINE = TokuDB, - PARTITION Partf VALUES LESS THAN (19) ENGINE = TokuDB, - PARTITION PartG VALUES LESS THAN (22) ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = TokuDB, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = TokuDB, + PARTITION `partE` VALUES LESS THAN (16) ENGINE = TokuDB, + PARTITION `Partf` VALUES LESS THAN (19) ENGINE = TokuDB, + PARTITION `PartG` VALUES LESS THAN (22) ENGINE = TokuDB) ALTER TABLE TableA DROP PARTITION partE, PartG; ALTER TABLE TableA DROP PARTITION Partf; ALTER TABLE TableA ADD PARTITION @@ -549,12 +549,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (7) ENGINE = TokuDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION PartD VALUES LESS THAN (13) ENGINE = TokuDB, - PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = TokuDB, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = TokuDB, + PARTITION `PartE` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) # Test of REORGANIZE PARTITIONS # Error since it must reorganize a consecutive range ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO @@ -587,11 +587,11 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = TokuDB, - PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = TokuDB, + PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = TokuDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -667,11 +667,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (7) ENGINE = TokuDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION PartD VALUES LESS THAN (13) ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = TokuDB, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = TokuDB) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -749,14 +749,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = TokuDB, - PARTITION partB VALUES IN (2,10,11) ENGINE = TokuDB, - PARTITION Partc VALUES IN (3,4,7) ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB, - PARTITION partE VALUES IN (16) ENGINE = TokuDB, - PARTITION Partf VALUES IN (19) ENGINE = TokuDB, - PARTITION PartG VALUES IN (22) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = TokuDB, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = TokuDB, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB, + PARTITION `partE` VALUES IN (16) ENGINE = TokuDB, + PARTITION `Partf` VALUES IN (19) ENGINE = TokuDB, + PARTITION `PartG` VALUES IN (22) ENGINE = TokuDB) ALTER TABLE TableA DROP PARTITION partE, PartG; ALTER TABLE TableA DROP PARTITION Partf; ALTER TABLE TableA ADD PARTITION @@ -780,12 +780,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = TokuDB, - PARTITION partB VALUES IN (2,10,11) ENGINE = TokuDB, - PARTITION Partc VALUES IN (3,4,7) ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB, - PARTITION PartE VALUES IN (13) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = TokuDB, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = TokuDB, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB, + PARTITION `PartE` VALUES IN (13) ENGINE = TokuDB) # Test of REORGANIZE PARTITIONS ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO (PARTITION Partc VALUES IN (1,7) @@ -818,12 +818,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = TokuDB, - PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = TokuDB, - PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB, - PARTITION PartE VALUES IN (13) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = TokuDB, + PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = TokuDB, + PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB, + PARTITION `PartE` VALUES IN (13) ENGINE = TokuDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -890,11 +890,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = TokuDB, - PARTITION partB VALUES IN (2,10,11) ENGINE = TokuDB, - PARTITION Partc VALUES IN (3,4,7) ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = TokuDB, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = TokuDB, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB) DROP TABLE tablea; # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; @@ -933,10 +933,10 @@ t1 CREATE TABLE `t1` ( `b` varchar(255) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB AUTO_INCREMENT=2002 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION LT1000 VALUES LESS THAN (1000) ENGINE = TokuDB, - PARTITION LT2000 VALUES LESS THAN (2000) ENGINE = TokuDB, - PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `LT1000` VALUES LESS THAN (1000) ENGINE = TokuDB, + PARTITION `LT2000` VALUES LESS THAN (2000) ENGINE = TokuDB, + PARTITION `MAX` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) SELECT * FROM t1 ORDER BY a; a b 1 First diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc1_tokudb.result index 63ecc04b812..fce0d496032 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc1_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc1_tokudb.result @@ -56,14 +56,14 @@ Table Create Table TableA CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB, - PARTITION PartD ENGINE = TokuDB, - PARTITION partE ENGINE = TokuDB, - PARTITION Partf ENGINE = TokuDB, - PARTITION PartG ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB, + PARTITION `PartD` ENGINE = TokuDB, + PARTITION `partE` ENGINE = TokuDB, + PARTITION `Partf` ENGINE = TokuDB, + PARTITION `PartG` ENGINE = TokuDB) 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) SELECT * FROM TableB; a 10 @@ -156,10 +156,10 @@ Table Create Table TableA CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = TokuDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = TokuDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = TokuDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY KEY (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = TokuDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB, - PARTITION PartD ENGINE = TokuDB, - PARTITION partE ENGINE = TokuDB, - PARTITION Partf ENGINE = TokuDB, - PARTITION PartG ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB, + PARTITION `PartD` ENGINE = TokuDB, + PARTITION `partE` ENGINE = TokuDB, + PARTITION `Partf` ENGINE = TokuDB, + PARTITION `PartG` ENGINE = TokuDB) 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = TokuDB, - PARTITION partB ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = TokuDB, + PARTITION `partB` ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = TokuDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = TokuDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = TokuDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = TokuDB, - PARTITION Partc ENGINE = TokuDB) + PARTITION BY HASH (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = TokuDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = TokuDB, + PARTITION `Partc` ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (7) ENGINE = TokuDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION PartD VALUES LESS THAN (13) ENGINE = TokuDB, - PARTITION partE VALUES LESS THAN (16) ENGINE = TokuDB, - PARTITION Partf VALUES LESS THAN (19) ENGINE = TokuDB, - PARTITION PartG VALUES LESS THAN (22) ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = TokuDB, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = TokuDB, + PARTITION `partE` VALUES LESS THAN (16) ENGINE = TokuDB, + PARTITION `Partf` VALUES LESS THAN (19) ENGINE = TokuDB, + PARTITION `PartG` VALUES LESS THAN (22) ENGINE = TokuDB) 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (7) ENGINE = TokuDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION PartD VALUES LESS THAN (13) ENGINE = TokuDB, - PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = TokuDB, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = TokuDB, + PARTITION `PartE` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = TokuDB, - PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = TokuDB, + PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = TokuDB, - PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = TokuDB, - PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = TokuDB, - PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = TokuDB, + PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = TokuDB, + PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = TokuDB, + PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = TokuDB, - PARTITION partB VALUES IN (2,10,11) ENGINE = TokuDB, - PARTITION Partc VALUES IN (3,4,7) ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB, - PARTITION partE VALUES IN (16) ENGINE = TokuDB, - PARTITION Partf VALUES IN (19) ENGINE = TokuDB, - PARTITION PartG VALUES IN (22) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = TokuDB, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = TokuDB, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB, + PARTITION `partE` VALUES IN (16) ENGINE = TokuDB, + PARTITION `Partf` VALUES IN (19) ENGINE = TokuDB, + PARTITION `PartG` VALUES IN (22) ENGINE = TokuDB) 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = TokuDB, - PARTITION partB VALUES IN (2,10,11) ENGINE = TokuDB, - PARTITION Partc VALUES IN (3,4,7) ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB, - PARTITION PartE VALUES IN (13) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = TokuDB, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = TokuDB, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB, + PARTITION `PartE` VALUES IN (13) ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = TokuDB, - PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = TokuDB, - PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB, - PARTITION PartE VALUES IN (13) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = TokuDB, + PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = TokuDB, + PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB, + PARTITION `PartE` VALUES IN (13) ENGINE = TokuDB) # 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=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = TokuDB, - PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = TokuDB, - PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = TokuDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = TokuDB, - PARTITION PartE VALUES IN (13) ENGINE = TokuDB) + PARTITION BY LIST (`a`) +(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = TokuDB, + PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = TokuDB, + PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = TokuDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = TokuDB, + PARTITION `PartE` VALUES IN (13) ENGINE = TokuDB) # 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=TokuDB AUTO_INCREMENT=2002 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION LT1000 VALUES LESS THAN (1000) ENGINE = TokuDB, - PARTITION LT2000 VALUES LESS THAN (2000) ENGINE = TokuDB, - PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = TokuDB) + PARTITION BY RANGE (`a`) +(PARTITION `LT1000` VALUES LESS THAN (1000) ENGINE = TokuDB, + PARTITION `LT2000` VALUES LESS THAN (2000) ENGINE = TokuDB, + PARTITION `MAX` VALUES LESS THAN MAXVALUE ENGINE = TokuDB) SELECT * FROM t1 ORDER BY a; a b 1 First diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_special_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_special_tokudb.result index 79274aa903b..a2df5bc5831 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_special_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_special_tokudb.result @@ -13,11 +13,11 @@ t1 CREATE TABLE `t1` ( `d` enum('m','w') NOT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`,`b`,`c`,`d`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m'), ('1983-12-31', 'cdef', 'srtbvsr', 'w'), @@ -55,11 +55,11 @@ t1 CREATE TABLE `t1` ( `i` char(255) DEFAULT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d,e,f,g,h) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, 'tbhth nrzh ztfghgfh fzh ftzhj fztjh'), ('1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, 'liuugbzvdmrlti b itiortudirtfgtibm dfi'), @@ -105,11 +105,11 @@ t1 CREATE TABLE `t1` ( `i` char(255) DEFAULT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113,'1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, 'tbhth nrzh ztfghgfh fzh ftzhj fztjh'), ('1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127,'1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, 'liuugbzvdmrlti b itiortudirtfgtibm dfi'), @@ -185,11 +185,11 @@ t1 CREATE TABLE `t1` ( `i` char(255) DEFAULT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a,b,c,d,e,f,g,h) -(PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, - PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, - PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, - PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) + PARTITION BY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`) +(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = TokuDB, + PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = TokuDB, + PARTITION `pa3` MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = TokuDB, + PARTITION `pa4` MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = TokuDB) insert into t1 values ('1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113,'1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113,'1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, '1975-01-01', 'abcde', 'abcde','m', 1234, 123.45, 32412341234, 113, 'tbhth nrzh ztfghgfh fzh ftzhj fztjh'), ('1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127,'1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, '1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, '1983-12-31', 'cdef', 'srtbvsr', 'w', 45634, 13452.56, 3452346456, 127, 'liuugbzvdmrlti b itiortudirtfgtibm dfi'), diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result index 1b5d2870cda..c84b4601332 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result @@ -658,9 +658,9 @@ 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,2)) -(PARTITION part1 VALUES IN (NULL) ENGINE = TokuDB, - PARTITION part3 VALUES IN (1) ENGINE = TokuDB) + PARTITION BY LIST (`f_int1` % 2) +(PARTITION `part1` VALUES IN (NULL) ENGINE = TokuDB, + PARTITION `part3` VALUES IN (1) ENGINE = TokuDB) DROP TABLE t1; # 3.5.3 Reveal that IN (...NULL) is not mapped to IN(0) @@ -685,10 +685,10 @@ 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,2)) -(PARTITION part1 VALUES IN (NULL) ENGINE = TokuDB, - PARTITION part2 VALUES IN (0) ENGINE = TokuDB, - PARTITION part3 VALUES IN (1) ENGINE = TokuDB) + PARTITION BY LIST (`f_int1` % 2) +(PARTITION `part1` VALUES IN (NULL) ENGINE = TokuDB, + PARTITION `part2` VALUES IN (0) ENGINE = TokuDB, + PARTITION `part3` VALUES IN (1) ENGINE = TokuDB) DROP TABLE t1; @@ -719,7 +719,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`) DROP TABLE t1; # 4.1.2 no partition number, named partitions @@ -741,9 +741,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 part1 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB) DROP TABLE t1; # 4.1.3 variations on no partition/subpartition number, named partitions, @@ -826,17 +826,17 @@ 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_int1) -(PARTITION part1 VALUES LESS THAN (10) - (SUBPARTITION subpart11 ENGINE = TokuDB, - SUBPARTITION subpart12 ENGINE = TokuDB), - PARTITION part2 VALUES LESS THAN (20) - (SUBPARTITION subpart21 ENGINE = TokuDB, - SUBPARTITION subpart22 ENGINE = TokuDB), - PARTITION part3 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart31 ENGINE = TokuDB, - SUBPARTITION subpart32 ENGINE = TokuDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (10) + (SUBPARTITION `subpart11` ENGINE = TokuDB, + SUBPARTITION `subpart12` ENGINE = TokuDB), + PARTITION `part2` VALUES LESS THAN (20) + (SUBPARTITION `subpart21` ENGINE = TokuDB, + SUBPARTITION `subpart22` ENGINE = TokuDB), + PARTITION `part3` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart31` ENGINE = TokuDB, + SUBPARTITION `subpart32` ENGINE = TokuDB)) DROP TABLE t1; #------------------------------------------------------------------------ @@ -862,7 +862,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 DROP TABLE t1; @@ -887,11 +887,11 @@ 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_int1) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) SUBPARTITIONS 2 -(PARTITION part1 VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = TokuDB) +(PARTITION `part1` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `part2` VALUES LESS THAN (2147483646) ENGINE = TokuDB) DROP TABLE t1; CREATE TABLE t1 ( @@ -912,7 +912,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 1 DROP TABLE t1; @@ -937,11 +937,11 @@ 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_int1) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) SUBPARTITIONS 1 -(PARTITION part1 VALUES LESS THAN (10) ENGINE = TokuDB, - PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = TokuDB) +(PARTITION `part1` VALUES LESS THAN (10) ENGINE = TokuDB, + PARTITION `part2` VALUES LESS THAN (2147483646) ENGINE = TokuDB) DROP TABLE t1; CREATE TABLE t1 ( @@ -1681,9 +1681,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 part1 ENGINE = TokuDB, - PARTITION part2 ENGINE = TokuDB) + PARTITION BY HASH (`f_int1`) +(PARTITION `part1` ENGINE = TokuDB, + PARTITION `part2` ENGINE = TokuDB) DROP TABLE t1; CREATE TABLE t1 ( @@ -1710,14 +1710,14 @@ 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_int1) -(PARTITION part1 VALUES LESS THAN (1000) - (SUBPARTITION subpart11 ENGINE = TokuDB, - SUBPARTITION subpart12 ENGINE = TokuDB), - PARTITION part2 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart21 ENGINE = TokuDB, - SUBPARTITION subpart22 ENGINE = TokuDB)) + PARTITION BY RANGE (`f_int1`) +SUBPARTITION BY HASH (`f_int1`) +(PARTITION `part1` VALUES LESS THAN (1000) + (SUBPARTITION `subpart11` ENGINE = TokuDB, + SUBPARTITION `subpart12` ENGINE = TokuDB), + PARTITION `part2` VALUES LESS THAN (2147483646) + (SUBPARTITION `subpart21` ENGINE = TokuDB, + SUBPARTITION `subpart22` ENGINE = TokuDB)) DROP TABLE t1; # 4.3.2 (positive) number of partition/subpartition , From e1093e2464c253dbd3b96da60502a37035d42c69 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 27 Jun 2017 20:47:46 +0200 Subject: [PATCH 077/102] cleanup: part_func_string and subpart_func_string Remove now-unused part_func_string and subpart_func_string from partition_info. --- sql/partition_info.cc | 4 ---- sql/partition_info.h | 7 ------- sql/sql_partition.cc | 33 --------------------------------- 3 files changed, 44 deletions(-) diff --git a/sql/partition_info.cc b/sql/partition_info.cc index b2588c375e5..2bf130fbf81 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -1683,15 +1683,11 @@ bool partition_info::set_part_expr(THD *thd, char *start_token, Item *item_ptr, { list_of_subpart_fields= FALSE; subpart_expr= item_ptr; - subpart_func_string= func_string; - subpart_func_len= expr_len; } else { list_of_part_fields= FALSE; part_expr= item_ptr; - part_func_string= func_string; - part_func_len= expr_len; } return FALSE; } diff --git a/sql/partition_info.h b/sql/partition_info.h index d4c180ddcdd..8ff7977373b 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -165,9 +165,6 @@ public: longlong err_value; char* part_info_string; - char *part_func_string; - char *subpart_func_string; - partition_element *curr_part_elem; // part or sub part partition_element *current_partition; // partition part_elem_value *curr_list_val; @@ -188,8 +185,6 @@ public: partition_type subpart_type; uint part_info_len; - uint part_func_len; - uint subpart_func_len; uint num_parts; uint num_subparts; @@ -257,13 +252,11 @@ public: bitmaps_are_initialized(FALSE), list_array(NULL), err_value(0), part_info_string(NULL), - part_func_string(NULL), subpart_func_string(NULL), curr_part_elem(NULL), current_partition(NULL), curr_list_object(0), num_columns(0), table(NULL), default_engine_type(NULL), part_type(NOT_A_PARTITION), subpart_type(NOT_A_PARTITION), part_info_len(0), - part_func_len(0), subpart_func_len(0), num_parts(0), num_subparts(0), count_curr_subparts(0), num_list_values(0), num_part_fields(0), num_subpart_fields(0), diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 22fa4242ad8..561ef91be4a 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4110,39 +4110,6 @@ bool mysql_unpack_partition(THD *thd, DBUG_ASSERT(part_info->default_engine_type == default_db_type); DBUG_ASSERT(part_info->default_engine_type->db_type != DB_TYPE_UNKNOWN); DBUG_ASSERT(part_info->default_engine_type != partition_hton); - - { - /* - This code part allocates memory for the serialised item information for - the partition functions. In most cases this is not needed but if the - table is used for SHOW CREATE TABLES or ALTER TABLE that modifies - partition information it is needed and the info is lost if we don't - save it here so unfortunately we have to do it here even if in most - cases it is not needed. This is a consequence of that item trees are - not serialisable. - */ - uint part_func_len= part_info->part_func_len; - uint subpart_func_len= part_info->subpart_func_len; - char *part_func_string= NULL; - char *subpart_func_string= NULL; - if ((part_func_len && - !((part_func_string= (char*) thd->alloc(part_func_len)))) || - (subpart_func_len && - !((subpart_func_string= (char*) thd->alloc(subpart_func_len))))) - { - mem_alloc_error(part_func_len); - thd->free_items(); - goto end; - } - if (part_func_len) - memcpy(part_func_string, part_info->part_func_string, part_func_len); - if (subpart_func_len) - memcpy(subpart_func_string, part_info->subpart_func_string, - subpart_func_len); - part_info->part_func_string= part_func_string; - part_info->subpart_func_string= subpart_func_string; - } - result= FALSE; end: end_lex_with_single_table(thd, table, old_lex); From 48c22a68b1ea3c2004e31ace37d56fa8a515dba8 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 28 Jun 2017 16:06:07 +0200 Subject: [PATCH 078/102] MDEV-13089 identifier quoting in partitioning remove ANSI_QUOTES when generating partition syntax for frm --- mysql-test/suite/parts/r/quoting.result | 30 +++++++++++++++++++++++++ mysql-test/suite/parts/t/quoting.test | 13 +++++++++++ sql/sql_table.cc | 10 +++++---- 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/parts/r/quoting.result b/mysql-test/suite/parts/r/quoting.result index 9495d790805..66606832e77 100644 --- a/mysql-test/suite/parts/r/quoting.result +++ b/mysql-test/suite/parts/r/quoting.result @@ -60,4 +60,34 @@ t2 CREATE TABLE `t2` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (`f1`) (PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +flush tables; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `select` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE (`select`) +(PARTITION `select` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +show create table t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `f1` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE (`f1`) +(PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +set sql_mode=ansi_quotes; +show create table t1; +Table Create Table +t1 CREATE TABLE "t1" ( + "select" int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE ("select") +(PARTITION "select" VALUES LESS THAN MAXVALUE ENGINE = MyISAM) +show create table t2; +Table Create Table +t2 CREATE TABLE "t2" ( + "f1" int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 + PARTITION BY RANGE ("f1") +(PARTITION "p1" VALUES LESS THAN MAXVALUE ENGINE = MyISAM) drop table t1, t2; diff --git a/mysql-test/suite/parts/t/quoting.test b/mysql-test/suite/parts/t/quoting.test index 4fec9a4f319..61af8d2d345 100644 --- a/mysql-test/suite/parts/t/quoting.test +++ b/mysql-test/suite/parts/t/quoting.test @@ -5,15 +5,28 @@ source include/have_partition.inc; set sql_mode=ansi_quotes; create table t1 ("select" int) partition by range ("select") (partition "select" values less than maxvalue); create table t2 (f1 int) partition by range (f1) (partition p1 values less than maxvalue); +# "select", "f1", "p1" show create table t1; show create table t2; set sql_quote_show_create=0; +# "select", f1, p1 show create table t1; show create table t2; set sql_mode=default; +# `select`, f1, p1 show create table t1; show create table t2; set sql_quote_show_create=1; +# `select`, `f1`, `p1` +show create table t1; +show create table t2; +# re-parse +flush tables; +# `select`, `f1`, `p1` +show create table t1; +show create table t2; +set sql_mode=ansi_quotes; +# "select", "f1", "p1" show create table t1; show create table t2; drop table t1, t2; diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 222b3182114..5e247915905 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4543,10 +4543,12 @@ handler *mysql_create_frm_image(THD *thd, We reverse the partitioning parser and generate a standard format for syntax stored in frm file. */ - if (!(part_syntax_buf= generate_partition_syntax(thd, part_info, - &syntax_len, TRUE, - create_info, - alter_info))) + sql_mode_t old_mode= thd->variables.sql_mode; + thd->variables.sql_mode &= ~MODE_ANSI_QUOTES; + part_syntax_buf= generate_partition_syntax(thd, part_info, &syntax_len, + true, create_info, alter_info); + thd->variables.sql_mode= old_mode; + if (!part_syntax_buf) goto err; part_info->part_info_string= part_syntax_buf; part_info->part_info_len= syntax_len; From cf9c2905635e477ab7def6d622d7d3ed35d8ac46 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 28 Jun 2017 18:55:33 +0200 Subject: [PATCH 079/102] MDEV-12738 main.default fails with valgrind in buildbot and outside --- sql/table.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/table.cc b/sql/table.cc index 45a2966407a..511a1567a53 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2746,7 +2746,7 @@ static bool fix_vcol_expr(THD *thd, Virtual_column_info *vcol) { StringBuffer str; vcol->print(&str); - my_error(ER_ERROR_EVALUATING_EXPRESSION, MYF(0), str.c_ptr()); + my_error(ER_ERROR_EVALUATING_EXPRESSION, MYF(0), str.c_ptr_safe()); DBUG_RETURN(1); } From d2d52305b45dc02fd8b9520569b18ccc7f5d196b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 28 Jun 2017 19:41:08 +0200 Subject: [PATCH 080/102] MDEV-12755 Replication tests fail in buildbot with ASAN remove double-initialization of MYSQL structure --- client/mysql.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client/mysql.cc b/client/mysql.cc index f9aba0fd62a..d85b118a2bb 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1145,8 +1145,6 @@ int main(int argc,char *argv[]) outfile[0]=0; // no (default) outfile strmov(pager, "stdout"); // the default, if --pager wasn't given - mysql_init(&mysql); - { char *tmp=getenv("PAGER"); if (tmp && strlen(tmp)) @@ -1185,7 +1183,11 @@ int main(int argc,char *argv[]) } defaults_argv=argv; if ((status.exit_status= get_options(argc, (char **) argv))) - mysql_end(-1); + { + free_defaults(defaults_argv); + my_end(0); + exit(status.exit_status); + } if (status.batch && !status.line_buff && !(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, stdin))) From 186075adf285725be1c8ca6f668addccf76b4f95 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 30 Jun 2017 16:31:46 +0200 Subject: [PATCH 081/102] MDEV-12938 Discrepancy between mysql_config and mariadb_config Use the correct target name when querying libmariadb.so dependencies. Filter out linker options (no-undefined and the version script) --- cmake/for_clients.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/for_clients.cmake b/cmake/for_clients.cmake index 636610e7fba..e5916c56ddc 100644 --- a/cmake/for_clients.cmake +++ b/cmake/for_clients.cmake @@ -45,7 +45,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) ENDIF() ENDMACRO() -EXTRACT_LINK_LIBRARIES(mariadb LIBS) +EXTRACT_LINK_LIBRARIES(libmariadb LIBS) EXTRACT_LINK_LIBRARIES(mysqlserver EMB_LIBS) SET(LIBS "-lmariadb ${ZLIB_DEPS} ${LIBS} ${openssl_libs}") @@ -72,6 +72,6 @@ REPLACE_FOR_CLIENTS(CFLAGS "[DU]DBUG_OFF" "[DU]SAFE_MUTEX" "[DU]NDEBUG" "xstrconst" "xc99=none" "AC99" "restrict" "W[-A-Za-z]*=[-A-Za-z0-9]*") # Same for --libs -REPLACE_FOR_CLIENTS(LIBS lmtmalloc static-libcxa i-static static-intel) +REPLACE_FOR_CLIENTS(LIBS "Wl,[^ ]*" lmtmalloc static-libcxa i-static static-intel) REPLACE_FOR_CLIENTS(EMB_LIBS lmtmalloc static-libcxa i-static static-intel) From 0559f12972dba6a141de553aacd724b2bcfaf71d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 30 Jun 2017 20:15:38 +0200 Subject: [PATCH 082/102] MDEV-13209 Cross-database operation with virtual columns fails if we don't need to print field's table name, we surely don't need to print field's db name either --- mysql-test/suite/vcol/r/cross_db.result | 17 +++++++++++++++++ mysql-test/suite/vcol/t/cross_db.test | 9 +++++++++ sql/item.cc | 9 ++++----- 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 mysql-test/suite/vcol/r/cross_db.result create mode 100644 mysql-test/suite/vcol/t/cross_db.test diff --git a/mysql-test/suite/vcol/r/cross_db.result b/mysql-test/suite/vcol/r/cross_db.result new file mode 100644 index 00000000000..c99f8e919d9 --- /dev/null +++ b/mysql-test/suite/vcol/r/cross_db.result @@ -0,0 +1,17 @@ +create database mysqltest1; +create table mysqltest1.t1 (i int, j int as (i) persistent); +show create table mysqltest1.t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `i` int(11) DEFAULT NULL, + `j` int(11) GENERATED ALWAYS AS (`i`) STORED +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +alter table mysqltest1.t1 add index (i); +show create table mysqltest1.t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `i` int(11) DEFAULT NULL, + `j` int(11) GENERATED ALWAYS AS (`i`) STORED, + KEY `i` (`i`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +drop database mysqltest1; diff --git a/mysql-test/suite/vcol/t/cross_db.test b/mysql-test/suite/vcol/t/cross_db.test new file mode 100644 index 00000000000..6804c459b84 --- /dev/null +++ b/mysql-test/suite/vcol/t/cross_db.test @@ -0,0 +1,9 @@ +# +# MDEV-13209 Cross-database operation with virtual columns fails +# +create database mysqltest1; +create table mysqltest1.t1 (i int, j int as (i) persistent); +show create table mysqltest1.t1; +alter table mysqltest1.t1 add index (i); +show create table mysqltest1.t1; +drop database mysqltest1; diff --git a/sql/item.cc b/sql/item.cc index 12935a43bea..adc1c1b9d46 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -2669,22 +2669,21 @@ void Item_ident::print(String *str, enum_query_type query_type) use_db_name= !(cached_table && cached_table->belong_to_view && cached_table->belong_to_view->compact_view_format); - if (!use_db_name && use_table_name && - (query_type & QT_ITEM_IDENT_SKIP_TABLE_NAMES)) + if (use_table_name && (query_type & QT_ITEM_IDENT_SKIP_TABLE_NAMES)) { /* Don't print the table name if it's the only table in the context XXX technically, that's a sufficient, but too strong condition */ if (!context) - use_table_name= false; + use_db_name= use_table_name= false; else if (context->outer_context) use_table_name= true; else if (context->last_name_resolution_table == context->first_name_resolution_table) - use_table_name= false; + use_db_name= use_table_name= false; else if (!context->last_name_resolution_table && !context->first_name_resolution_table->next_name_resolution_table) - use_table_name= false; + use_db_name= use_table_name= false; } if (!field_name || !field_name[0]) From 291411c96ceb914950731df6c36b32fc83b58acf Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 29 Jun 2017 00:57:20 +0200 Subject: [PATCH 083/102] MDEV-13132 Information Schema does not show whether column default is expression or literal Fix INFORMATION_SCHEMA.COLUMNS.COLUMN_DEFAULT to be standard-compliant, but keep SHOW COLUMNS backward-compatibly unchanged. --- mysql-test/r/client_xml.result | 8 +- mysql-test/r/information_schema.result | 10 +- .../r/information_schema_parameters.result | 12 +- .../r/information_schema_routines.result | 38 +- mysql-test/r/join.result | 4 +- mysql-test/r/mysqldump.result | 60 +-- mysql-test/suite/funcs_1/r/is_columns.result | 2 +- .../suite/funcs_1/r/is_columns_innodb.result | 32 +- .../suite/funcs_1/r/is_columns_is.result | 444 +++++++++--------- .../funcs_1/r/is_columns_is_embedded.result | 444 +++++++++--------- .../suite/funcs_1/r/is_columns_memory.result | 32 +- .../suite/funcs_1/r/is_columns_myisam.result | 32 +- .../r/is_columns_myisam_embedded.result | 32 +- .../suite/funcs_1/r/is_columns_mysql.result | 280 +++++------ .../r/is_columns_mysql_embedded.result | 280 +++++------ .../suite/perfschema/r/table_schema.result | 28 +- mysql-test/t/client_xml.test | 2 +- sql/sql_show.cc | 3 +- 18 files changed, 872 insertions(+), 871 deletions(-) diff --git a/mysql-test/r/client_xml.result b/mysql-test/r/client_xml.result index 7f74a092af7..6f91c18318c 100644 --- a/mysql-test/r/client_xml.result +++ b/mysql-test/r/client_xml.result @@ -3,7 +3,7 @@ set @@global.concurrent_insert= 0; drop table if exists t1; create table t1 ( `a&b` int, -`ab` text ); insert into t1 values (1, 2, 'a&b ab'); @@ -21,9 +21,9 @@ insert into t1 values (1, 2, 'a&b ab'); - - - + + + diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index dad6d5d8c8a..00ec9d9f39c 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -1344,13 +1344,13 @@ DROP TABLE IF EXISTS bug23037; DROP FUNCTION IF EXISTS get_value; SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037'; COLUMN_NAME MD5(COLUMN_DEFAULT) LENGTH(COLUMN_DEFAULT) -fld1 7cf7a6782be951a1f2464a350da926a5 65532 +fld1 85ea6a55b8f0058e640b3de141a3a9d9 65534 SELECT MD5(get_value()); MD5(get_value()) -7cf7a6782be951a1f2464a350da926a5 +76176d2daa20c582375b8dcfc18033cd SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT), COLUMN_DEFAULT=get_value() FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037'; COLUMN_NAME MD5(COLUMN_DEFAULT) LENGTH(COLUMN_DEFAULT) COLUMN_DEFAULT=get_value() -fld1 7cf7a6782be951a1f2464a350da926a5 65532 1 +fld1 85ea6a55b8f0058e640b3de141a3a9d9 65534 0 DROP TABLE bug23037; DROP FUNCTION get_value; set @tmp_optimizer_switch=@@optimizer_switch; @@ -1437,12 +1437,12 @@ select column_default from information_schema.columns where table_name= 't1'; column_default NULL NULL - +'' NULL NULL 10 NULL -2006-01-01 00:00:00 +'2006-01-01 00:00:00' show columns from t1; Field Type Null Key Default Extra f1 varchar(50) YES NULL diff --git a/mysql-test/r/information_schema_parameters.result b/mysql-test/r/information_schema_parameters.result index 67527fbfe7f..1d974851133 100644 --- a/mysql-test/r/information_schema_parameters.result +++ b/mysql-test/r/information_schema_parameters.result @@ -29,7 +29,7 @@ TABLE_SCHEMA information_schema TABLE_NAME PARAMETERS COLUMN_NAME SPECIFIC_CATALOG ORDINAL_POSITION 1 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 512 @@ -51,7 +51,7 @@ TABLE_SCHEMA information_schema TABLE_NAME PARAMETERS COLUMN_NAME SPECIFIC_SCHEMA ORDINAL_POSITION 2 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 64 @@ -73,7 +73,7 @@ TABLE_SCHEMA information_schema TABLE_NAME PARAMETERS COLUMN_NAME SPECIFIC_NAME ORDINAL_POSITION 3 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 64 @@ -161,7 +161,7 @@ TABLE_SCHEMA information_schema TABLE_NAME PARAMETERS COLUMN_NAME DATA_TYPE ORDINAL_POSITION 7 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 64 @@ -337,7 +337,7 @@ TABLE_SCHEMA information_schema TABLE_NAME PARAMETERS COLUMN_NAME DTD_IDENTIFIER ORDINAL_POSITION 15 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE longtext CHARACTER_MAXIMUM_LENGTH 4294967295 @@ -359,7 +359,7 @@ TABLE_SCHEMA information_schema TABLE_NAME PARAMETERS COLUMN_NAME ROUTINE_TYPE ORDINAL_POSITION 16 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 9 diff --git a/mysql-test/r/information_schema_routines.result b/mysql-test/r/information_schema_routines.result index bfbd5941834..0d83f3a2bda 100644 --- a/mysql-test/r/information_schema_routines.result +++ b/mysql-test/r/information_schema_routines.result @@ -46,7 +46,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME SPECIFIC_NAME ORDINAL_POSITION 1 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 64 @@ -68,7 +68,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME ROUTINE_CATALOG ORDINAL_POSITION 2 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 512 @@ -90,7 +90,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME ROUTINE_SCHEMA ORDINAL_POSITION 3 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 64 @@ -112,7 +112,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME ROUTINE_NAME ORDINAL_POSITION 4 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 64 @@ -134,7 +134,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME ROUTINE_TYPE ORDINAL_POSITION 5 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 9 @@ -156,7 +156,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME DATA_TYPE ORDINAL_POSITION 6 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 64 @@ -354,7 +354,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME ROUTINE_BODY ORDINAL_POSITION 15 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 8 @@ -442,7 +442,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME PARAMETER_STYLE ORDINAL_POSITION 19 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 8 @@ -464,7 +464,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME IS_DETERMINISTIC ORDINAL_POSITION 20 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 3 @@ -486,7 +486,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME SQL_DATA_ACCESS ORDINAL_POSITION 21 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 64 @@ -530,7 +530,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME SECURITY_TYPE ORDINAL_POSITION 23 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 7 @@ -552,7 +552,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME CREATED ORDINAL_POSITION 24 -COLUMN_DEFAULT 0000-00-00 00:00:00 +COLUMN_DEFAULT '0000-00-00 00:00:00' IS_NULLABLE NO DATA_TYPE datetime CHARACTER_MAXIMUM_LENGTH NULL @@ -574,7 +574,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME LAST_ALTERED ORDINAL_POSITION 25 -COLUMN_DEFAULT 0000-00-00 00:00:00 +COLUMN_DEFAULT '0000-00-00 00:00:00' IS_NULLABLE NO DATA_TYPE datetime CHARACTER_MAXIMUM_LENGTH NULL @@ -596,7 +596,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME SQL_MODE ORDINAL_POSITION 26 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 8192 @@ -618,7 +618,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME ROUTINE_COMMENT ORDINAL_POSITION 27 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE longtext CHARACTER_MAXIMUM_LENGTH 4294967295 @@ -640,7 +640,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME DEFINER ORDINAL_POSITION 28 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 189 @@ -662,7 +662,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME CHARACTER_SET_CLIENT ORDINAL_POSITION 29 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 32 @@ -684,7 +684,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME COLLATION_CONNECTION ORDINAL_POSITION 30 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 32 @@ -706,7 +706,7 @@ TABLE_SCHEMA information_schema TABLE_NAME ROUTINES COLUMN_NAME DATABASE_COLLATION ORDINAL_POSITION 31 -COLUMN_DEFAULT +COLUMN_DEFAULT '' IS_NULLABLE NO DATA_TYPE varchar CHARACTER_MAXIMUM_LENGTH 32 diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index aea2d604b03..596cecfa8b2 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -757,8 +757,8 @@ statistics.TABLE_NAME, statistics.COLUMN_NAME, statistics.TABLE_CATALOG, statist columns.TABLE_CATALOG, columns.TABLE_SCHEMA, columns.COLUMN_DEFAULT, columns.IS_NULLABLE, columns.DATA_TYPE, columns.CHARACTER_MAXIMUM_LENGTH, columns.CHARACTER_OCTET_LENGTH, columns.NUMERIC_PRECISION, columns.NUMERIC_SCALE, columns.CHARACTER_SET_NAME, columns.COLLATION_NAME, columns.COLUMN_TYPE, columns.COLUMN_KEY, columns.EXTRA, columns.COLUMN_COMMENT from information_schema.statistics join information_schema.columns using(table_name,column_name) where table_name='user'; TABLE_NAME COLUMN_NAME TABLE_CATALOG TABLE_SCHEMA NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLLATION SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT TABLE_CATALOG TABLE_SCHEMA COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA COLUMN_COMMENT -user Host def mysql 0 mysql PRIMARY 1 A NULL NULL BTREE def mysql NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI -user User def mysql 0 mysql PRIMARY 2 A NULL NULL BTREE def mysql NO char 80 240 NULL NULL utf8 utf8_bin char(80) PRI +user Host def mysql 0 mysql PRIMARY 1 A NULL NULL BTREE def mysql '' NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI +user User def mysql 0 mysql PRIMARY 2 A NULL NULL BTREE def mysql '' NO char 80 240 NULL NULL utf8 utf8_bin char(80) PRI Warnings: Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB' diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 5a8c1e7a8ae..7f6107db5e4 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -15,7 +15,7 @@ INSERT INTO t1 VALUES (1), (2); - + @@ -151,9 +151,9 @@ INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES"); - - - + + + @@ -179,7 +179,7 @@ INSERT INTO t1 VALUES ("1\""), ("\"2"); - + @@ -1613,10 +1613,10 @@ CREATE TABLE `t2` ( - + - + @@ -1624,10 +1624,10 @@ CREATE TABLE `t2` ( - + - + @@ -3739,8 +3739,8 @@ INSERT INTO t1 VALUES(1,0xff00fef0); - - + + @@ -4681,7 +4681,7 @@ CREATE TABLE `comment_table` (i INT COMMENT 'FIELD COMMENT') COMMENT = 'TABLE CO - + @@ -4778,8 +4778,8 @@ CREATE VIEW v2 AS SELECT * FROM t2; - - + + @@ -4797,7 +4797,7 @@ CREATE VIEW v2 AS SELECT * FROM t2; - + @@ -4833,12 +4833,12 @@ END - - + + - + @@ -4901,8 +4901,8 @@ END --> - - + + - + - - + + - +