diff options
Diffstat (limited to 'mysql-test')
40 files changed, 1778 insertions, 1146 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0f720c804ab..df9b0d835c2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2269,10 +2269,15 @@ sub environment_setup { $ENV{'MYSQL_EMBEDDED'}= $exe_mysql_embedded; my $client_config_exe= - native_path("$bindir/libmariadb/mariadb_config$opt_vs_config/mariadb_config"); - my $tls_info= `$client_config_exe --tlsinfo`; - ($ENV{CLIENT_TLS_LIBRARY},$ENV{CLIENT_TLS_LIBRARY_VERSION})= - split(/ /, $tls_info, 2); + mtr_exe_maybe_exists( + "$bindir/libmariadb/mariadb_config$opt_vs_config/mariadb_config", + "$bindir/bin/mariadb_config"); + if ($client_config_exe) + { + my $tls_info= `$client_config_exe --tlsinfo`; + ($ENV{CLIENT_TLS_LIBRARY},$ENV{CLIENT_TLS_LIBRARY_VERSION})= + split(/ /, $tls_info, 2); + } my $exe_mysqld= find_mysqld($basedir); $ENV{'MYSQLD'}= $exe_mysqld; my $extra_opts= join (" ", @opt_extra_mysqld_opt); diff --git a/mysql-test/r/analyze_format_json.result b/mysql-test/r/analyze_format_json.result index e077f919aa0..7991379bc55 100644 --- a/mysql-test/r/analyze_format_json.result +++ b/mysql-test/r/analyze_format_json.result @@ -758,3 +758,63 @@ ANALYZE } } drop table t1,t2,t3; +# +# MDEV-13286: Floating point exception in Filesort_tracker::print_json_members(Json_writer*) +# +create table t0(a int); +insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); +create table t1 (a int, b int, c int); +insert into t1 select a,a,a from t0; +create table t2 as select * from t1; +analyze format=json select a, (select t2.b from t2 where t2.a<t1.a order by t2.c limit 1) from t1 where t1.a<0; +ANALYZE +{ + "query_block": { + "select_id": 1, + "r_loops": 1, + "r_total_time_ms": "REPLACED", + "table": { + "table_name": "t1", + "access_type": "ALL", + "r_loops": 1, + "rows": 10, + "r_rows": 10, + "r_total_time_ms": "REPLACED", + "filtered": 100, + "r_filtered": 0, + "attached_condition": "t1.a < 0" + }, + "subqueries": [ + { + "expression_cache": { + "state": "uninitialized", + "r_loops": 0, + "query_block": { + "select_id": 2, + "read_sorted_file": { + "r_rows": null, + "filesort": { + "sort_key": "t2.c", + "r_loops": null, + "r_limit": null, + "r_used_priority_queue": null, + "r_output_rows": null, + "table": { + "table_name": "t2", + "access_type": "ALL", + "r_loops": 0, + "rows": 10, + "r_rows": null, + "filtered": 100, + "r_filtered": null, + "attached_condition": "t2.a < t1.a" + } + } + } + } + } + } + ] + } +} +drop table t0,t1,t2; diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 98a279c28e9..9f07b1fefff 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -4707,7 +4707,7 @@ pk SET SESSION sql_mode=@old_sql_mode; drop table t2, t1; drop view v1; -End of 5.0 tests. +# End of 5.0 tests. create table t_out (subcase char(3), a1 char(2), b1 char(2), c1 char(2)); create table t_in (a2 char(2), b2 char(2), c2 char(2)); @@ -5582,7 +5582,7 @@ insert into t2 values ('x'), ('y'); select * from t2 where a=(select a from t1) and a='x'; ERROR 21000: Subquery returns more than 1 row drop table t1,t2; -End of 5.1 tests +# End of 5.1 tests # # Bug #11765713 58705: # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES @@ -6194,7 +6194,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2 OR c_sq1_alias1.pk != @var3)) ) AS alias3; pk col_int_nokey col_int_key col_time_key col_varchar_key col_varchar_nokey DROP TABLE t1,t2; -End of 5.2 tests +# End of 5.2 tests # # BUG#779885: Crash in eliminate_item_equal with materialization=on in # @@ -7151,9 +7151,10 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2 (f2 INT, KEY(f2)); INSERT INTO t2 VALUES (3); CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -3 +ERROR 42000: Can't group on 'sq' SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0; f2 3 @@ -7161,9 +7162,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 ); count(*) 1 delete from t1; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -NULL +ERROR 42000: Can't group on 'sq' drop view v2; drop table t1,t2; # @@ -7178,6 +7180,29 @@ f1 f2 foo bar DROP TABLE t1; # +# MDEV-10146: Wrong result (or questionable result and behavior) +# with aggregate function in uncorrelated SELECT subquery +# +CREATE TABLE t1 (f1 INT); +CREATE VIEW v1 AS SELECT * FROM t1; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (f2 int); +INSERT INTO t2 VALUES (3); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +( SELECT MAX(f1) FROM t2 ) +2 +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +( SELECT MAX(f1) FROM t2 ) +2 +INSERT INTO t2 VALUES (4); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +ERROR 21000: Subquery returns more than 1 row +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +ERROR 21000: Subquery returns more than 1 row +drop view v1; +drop table t1,t2; +# End of 10.0 tests +# # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops # with UNION in ALL subquery # @@ -7204,7 +7229,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo'); f1 f2 f3 DROP TABLE t1, t2; SET NAMES default; -End of 10.1 tests +# End of 10.1 tests # # MDEV-12564: IN TO EXISTS transformation for rows after # conversion an outer join to inner join @@ -7218,4 +7243,4 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo pk i c pk i c 1 10 foo 1 10 foo DROP TABLE t; -End of 10.2 tests +# End of 10.2 tests diff --git a/mysql-test/r/subselect_no_exists_to_in.result b/mysql-test/r/subselect_no_exists_to_in.result index 5cee4076ed8..e4b57d96b38 100644 --- a/mysql-test/r/subselect_no_exists_to_in.result +++ b/mysql-test/r/subselect_no_exists_to_in.result @@ -4709,7 +4709,7 @@ pk SET SESSION sql_mode=@old_sql_mode; drop table t2, t1; drop view v1; -End of 5.0 tests. +# End of 5.0 tests. create table t_out (subcase char(3), a1 char(2), b1 char(2), c1 char(2)); create table t_in (a2 char(2), b2 char(2), c2 char(2)); @@ -5584,7 +5584,7 @@ insert into t2 values ('x'), ('y'); select * from t2 where a=(select a from t1) and a='x'; ERROR 21000: Subquery returns more than 1 row drop table t1,t2; -End of 5.1 tests +# End of 5.1 tests # # Bug #11765713 58705: # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES @@ -6194,7 +6194,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2 OR c_sq1_alias1.pk != @var3)) ) AS alias3; pk col_int_nokey col_int_key col_time_key col_varchar_key col_varchar_nokey DROP TABLE t1,t2; -End of 5.2 tests +# End of 5.2 tests # # BUG#779885: Crash in eliminate_item_equal with materialization=on in # @@ -7151,9 +7151,10 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2 (f2 INT, KEY(f2)); INSERT INTO t2 VALUES (3); CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -3 +ERROR 42000: Can't group on 'sq' SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0; f2 3 @@ -7161,9 +7162,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 ); count(*) 1 delete from t1; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -NULL +ERROR 42000: Can't group on 'sq' drop view v2; drop table t1,t2; # @@ -7178,6 +7180,29 @@ f1 f2 foo bar DROP TABLE t1; # +# MDEV-10146: Wrong result (or questionable result and behavior) +# with aggregate function in uncorrelated SELECT subquery +# +CREATE TABLE t1 (f1 INT); +CREATE VIEW v1 AS SELECT * FROM t1; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (f2 int); +INSERT INTO t2 VALUES (3); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +( SELECT MAX(f1) FROM t2 ) +2 +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +( SELECT MAX(f1) FROM t2 ) +2 +INSERT INTO t2 VALUES (4); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +ERROR 21000: Subquery returns more than 1 row +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +ERROR 21000: Subquery returns more than 1 row +drop view v1; +drop table t1,t2; +# End of 10.0 tests +# # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops # with UNION in ALL subquery # @@ -7204,7 +7229,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo'); f1 f2 f3 DROP TABLE t1, t2; SET NAMES default; -End of 10.1 tests +# End of 10.1 tests # # MDEV-12564: IN TO EXISTS transformation for rows after # conversion an outer join to inner join @@ -7218,7 +7243,7 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo pk i c pk i c 1 10 foo 1 10 foo DROP TABLE t; -End of 10.2 tests +# End of 10.2 tests set optimizer_switch=default; select @@optimizer_switch like '%exists_to_in=off%'; @@optimizer_switch like '%exists_to_in=off%' diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result index e7409b0b09c..22082774668 100644 --- a/mysql-test/r/subselect_no_mat.result +++ b/mysql-test/r/subselect_no_mat.result @@ -4707,7 +4707,7 @@ pk SET SESSION sql_mode=@old_sql_mode; drop table t2, t1; drop view v1; -End of 5.0 tests. +# End of 5.0 tests. create table t_out (subcase char(3), a1 char(2), b1 char(2), c1 char(2)); create table t_in (a2 char(2), b2 char(2), c2 char(2)); @@ -5582,7 +5582,7 @@ insert into t2 values ('x'), ('y'); select * from t2 where a=(select a from t1) and a='x'; ERROR 21000: Subquery returns more than 1 row drop table t1,t2; -End of 5.1 tests +# End of 5.1 tests # # Bug #11765713 58705: # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES @@ -6189,7 +6189,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2 OR c_sq1_alias1.pk != @var3)) ) AS alias3; pk col_int_nokey col_int_key col_time_key col_varchar_key col_varchar_nokey DROP TABLE t1,t2; -End of 5.2 tests +# End of 5.2 tests # # BUG#779885: Crash in eliminate_item_equal with materialization=on in # @@ -7144,9 +7144,10 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2 (f2 INT, KEY(f2)); INSERT INTO t2 VALUES (3); CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -3 +ERROR 42000: Can't group on 'sq' SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0; f2 3 @@ -7154,9 +7155,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 ); count(*) 1 delete from t1; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -NULL +ERROR 42000: Can't group on 'sq' drop view v2; drop table t1,t2; # @@ -7171,6 +7173,29 @@ f1 f2 foo bar DROP TABLE t1; # +# MDEV-10146: Wrong result (or questionable result and behavior) +# with aggregate function in uncorrelated SELECT subquery +# +CREATE TABLE t1 (f1 INT); +CREATE VIEW v1 AS SELECT * FROM t1; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (f2 int); +INSERT INTO t2 VALUES (3); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +( SELECT MAX(f1) FROM t2 ) +2 +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +( SELECT MAX(f1) FROM t2 ) +2 +INSERT INTO t2 VALUES (4); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +ERROR 21000: Subquery returns more than 1 row +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +ERROR 21000: Subquery returns more than 1 row +drop view v1; +drop table t1,t2; +# End of 10.0 tests +# # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops # with UNION in ALL subquery # @@ -7197,7 +7222,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo'); f1 f2 f3 DROP TABLE t1, t2; SET NAMES default; -End of 10.1 tests +# End of 10.1 tests # # MDEV-12564: IN TO EXISTS transformation for rows after # conversion an outer join to inner join @@ -7211,7 +7236,7 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo pk i c pk i c 1 10 foo 1 10 foo DROP TABLE t; -End of 10.2 tests +# End of 10.2 tests set optimizer_switch=default; select @@optimizer_switch like '%materialization=on%'; @@optimizer_switch like '%materialization=on%' diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result index 3bdc91686d7..5f71700c4ce 100644 --- a/mysql-test/r/subselect_no_opts.result +++ b/mysql-test/r/subselect_no_opts.result @@ -4703,7 +4703,7 @@ pk SET SESSION sql_mode=@old_sql_mode; drop table t2, t1; drop view v1; -End of 5.0 tests. +# End of 5.0 tests. create table t_out (subcase char(3), a1 char(2), b1 char(2), c1 char(2)); create table t_in (a2 char(2), b2 char(2), c2 char(2)); @@ -5578,7 +5578,7 @@ insert into t2 values ('x'), ('y'); select * from t2 where a=(select a from t1) and a='x'; ERROR 21000: Subquery returns more than 1 row drop table t1,t2; -End of 5.1 tests +# End of 5.1 tests # # Bug #11765713 58705: # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES @@ -6185,7 +6185,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2 OR c_sq1_alias1.pk != @var3)) ) AS alias3; pk col_int_nokey col_int_key col_time_key col_varchar_key col_varchar_nokey DROP TABLE t1,t2; -End of 5.2 tests +# End of 5.2 tests # # BUG#779885: Crash in eliminate_item_equal with materialization=on in # @@ -7142,9 +7142,10 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2 (f2 INT, KEY(f2)); INSERT INTO t2 VALUES (3); CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -3 +ERROR 42000: Can't group on 'sq' SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0; f2 3 @@ -7152,9 +7153,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 ); count(*) 1 delete from t1; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -NULL +ERROR 42000: Can't group on 'sq' drop view v2; drop table t1,t2; # @@ -7169,6 +7171,29 @@ f1 f2 foo bar DROP TABLE t1; # +# MDEV-10146: Wrong result (or questionable result and behavior) +# with aggregate function in uncorrelated SELECT subquery +# +CREATE TABLE t1 (f1 INT); +CREATE VIEW v1 AS SELECT * FROM t1; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (f2 int); +INSERT INTO t2 VALUES (3); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +( SELECT MAX(f1) FROM t2 ) +2 +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +( SELECT MAX(f1) FROM t2 ) +2 +INSERT INTO t2 VALUES (4); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +ERROR 21000: Subquery returns more than 1 row +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +ERROR 21000: Subquery returns more than 1 row +drop view v1; +drop table t1,t2; +# End of 10.0 tests +# # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops # with UNION in ALL subquery # @@ -7195,7 +7220,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo'); f1 f2 f3 DROP TABLE t1, t2; SET NAMES default; -End of 10.1 tests +# End of 10.1 tests # # MDEV-12564: IN TO EXISTS transformation for rows after # conversion an outer join to inner join @@ -7209,5 +7234,5 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo pk i c pk i c 1 10 foo 1 10 foo DROP TABLE t; -End of 10.2 tests +# End of 10.2 tests set @optimizer_switch_for_subselect_test=null; diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result index 3beba7c338d..8500fa2434c 100644 --- a/mysql-test/r/subselect_no_scache.result +++ b/mysql-test/r/subselect_no_scache.result @@ -4713,7 +4713,7 @@ pk SET SESSION sql_mode=@old_sql_mode; drop table t2, t1; drop view v1; -End of 5.0 tests. +# End of 5.0 tests. create table t_out (subcase char(3), a1 char(2), b1 char(2), c1 char(2)); create table t_in (a2 char(2), b2 char(2), c2 char(2)); @@ -5588,7 +5588,7 @@ insert into t2 values ('x'), ('y'); select * from t2 where a=(select a from t1) and a='x'; ERROR 21000: Subquery returns more than 1 row drop table t1,t2; -End of 5.1 tests +# End of 5.1 tests # # Bug #11765713 58705: # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES @@ -6200,7 +6200,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2 OR c_sq1_alias1.pk != @var3)) ) AS alias3; pk col_int_nokey col_int_key col_time_key col_varchar_key col_varchar_nokey DROP TABLE t1,t2; -End of 5.2 tests +# End of 5.2 tests # # BUG#779885: Crash in eliminate_item_equal with materialization=on in # @@ -7157,9 +7157,10 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2 (f2 INT, KEY(f2)); INSERT INTO t2 VALUES (3); CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -3 +ERROR 42000: Can't group on 'sq' SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0; f2 3 @@ -7167,9 +7168,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 ); count(*) 1 delete from t1; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -NULL +ERROR 42000: Can't group on 'sq' drop view v2; drop table t1,t2; # @@ -7184,6 +7186,29 @@ f1 f2 foo bar DROP TABLE t1; # +# MDEV-10146: Wrong result (or questionable result and behavior) +# with aggregate function in uncorrelated SELECT subquery +# +CREATE TABLE t1 (f1 INT); +CREATE VIEW v1 AS SELECT * FROM t1; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (f2 int); +INSERT INTO t2 VALUES (3); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +( SELECT MAX(f1) FROM t2 ) +2 +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +( SELECT MAX(f1) FROM t2 ) +2 +INSERT INTO t2 VALUES (4); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +ERROR 21000: Subquery returns more than 1 row +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +ERROR 21000: Subquery returns more than 1 row +drop view v1; +drop table t1,t2; +# End of 10.0 tests +# # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops # with UNION in ALL subquery # @@ -7210,7 +7235,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo'); f1 f2 f3 DROP TABLE t1, t2; SET NAMES default; -End of 10.1 tests +# End of 10.1 tests # # MDEV-12564: IN TO EXISTS transformation for rows after # conversion an outer join to inner join @@ -7224,7 +7249,7 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo pk i c pk i c 1 10 foo 1 10 foo DROP TABLE t; -End of 10.2 tests +# End of 10.2 tests set optimizer_switch=default; select @@optimizer_switch like '%subquery_cache=on%'; @@optimizer_switch like '%subquery_cache=on%' diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result index f2d97078772..48bf9ce90c9 100644 --- a/mysql-test/r/subselect_no_semijoin.result +++ b/mysql-test/r/subselect_no_semijoin.result @@ -4703,7 +4703,7 @@ pk SET SESSION sql_mode=@old_sql_mode; drop table t2, t1; drop view v1; -End of 5.0 tests. +# End of 5.0 tests. create table t_out (subcase char(3), a1 char(2), b1 char(2), c1 char(2)); create table t_in (a2 char(2), b2 char(2), c2 char(2)); @@ -5578,7 +5578,7 @@ insert into t2 values ('x'), ('y'); select * from t2 where a=(select a from t1) and a='x'; ERROR 21000: Subquery returns more than 1 row drop table t1,t2; -End of 5.1 tests +# End of 5.1 tests # # Bug #11765713 58705: # OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES @@ -6185,7 +6185,7 @@ WHERE (c_sq1_alias1.col_int_nokey != @var2 OR c_sq1_alias1.pk != @var3)) ) AS alias3; pk col_int_nokey col_int_key col_time_key col_varchar_key col_varchar_nokey DROP TABLE t1,t2; -End of 5.2 tests +# End of 5.2 tests # # BUG#779885: Crash in eliminate_item_equal with materialization=on in # @@ -7142,9 +7142,10 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2 (f2 INT, KEY(f2)); INSERT INTO t2 VALUES (3); CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -3 +ERROR 42000: Can't group on 'sq' SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0; f2 3 @@ -7152,9 +7153,10 @@ SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 ); count(*) 1 delete from t1; +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +ERROR 42000: Can't group on 'sq' SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; -sq -NULL +ERROR 42000: Can't group on 'sq' drop view v2; drop table t1,t2; # @@ -7169,6 +7171,29 @@ f1 f2 foo bar DROP TABLE t1; # +# MDEV-10146: Wrong result (or questionable result and behavior) +# with aggregate function in uncorrelated SELECT subquery +# +CREATE TABLE t1 (f1 INT); +CREATE VIEW v1 AS SELECT * FROM t1; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (f2 int); +INSERT INTO t2 VALUES (3); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +( SELECT MAX(f1) FROM t2 ) +2 +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +( SELECT MAX(f1) FROM t2 ) +2 +INSERT INTO t2 VALUES (4); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +ERROR 21000: Subquery returns more than 1 row +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; +ERROR 21000: Subquery returns more than 1 row +drop view v1; +drop table t1,t2; +# End of 10.0 tests +# # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops # with UNION in ALL subquery # @@ -7195,7 +7220,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo'); f1 f2 f3 DROP TABLE t1, t2; SET NAMES default; -End of 10.1 tests +# End of 10.1 tests # # MDEV-12564: IN TO EXISTS transformation for rows after # conversion an outer join to inner join @@ -7209,6 +7234,6 @@ WHERE (t2.i, t2.pk) NOT IN ( SELECT t3.i, t3.i FROM t t3, t t4 ) AND t1.c = 'foo pk i c pk i c 1 10 foo 1 10 foo DROP TABLE t; -End of 10.2 tests +# End of 10.2 tests set @optimizer_switch_for_subselect_test=null; set @join_cache_level_for_subselect_test=NULL; diff --git a/mysql-test/suite/binlog/r/flashback.result b/mysql-test/suite/binlog/r/flashback.result index 96729d3bc3c..c96eaebe838 100644 --- a/mysql-test/suite/binlog/r/flashback.result +++ b/mysql-test/suite/binlog/r/flashback.result @@ -613,7 +613,7 @@ DROP TABLE t1; # Test Case from MDEV-21067 # CREATE DATABASE world; -CREATE TABLE world.City ( +CREATE TABLE world.city ( ID INT AUTO_INCREMENT PRIMARY KEY, Name VARCHAR(64), CountryCode VARCHAR(64), @@ -625,35 +625,35 @@ ID INT AUTO_INCREMENT PRIMARY KEY, REC VARCHAR(64), ts TIMESTAMP ) ENGINE=InnoDB; -INSERT INTO world.City VALUES (NULL, 'Davenport', 'USA', 'Iowa', 100); -INSERT INTO world.City VALUES (NULL, 'Boulder', 'USA', 'Colorado', 1000); -INSERT INTO world.City VALUES (NULL, 'Gweru', 'ZWE', 'Midlands', 10000); +INSERT INTO world.city VALUES (NULL, 'Davenport', 'USA', 'Iowa', 100); +INSERT INTO world.city VALUES (NULL, 'Boulder', 'USA', 'Colorado', 1000); +INSERT INTO world.city VALUES (NULL, 'Gweru', 'ZWE', 'Midlands', 10000); RESET MASTER; -CHECKSUM TABLE world.City; +CHECKSUM TABLE world.city; Table Checksum -world.City 563256876 +world.city 563256876 INSERT INTO test.test VALUES (NULL, 'Good record 1', CURRENT_TIMESTAMP()); -INSERT INTO world.City VALUES (NULL, 'Wrong value 1', '000', 'Wrong', 0); -INSERT INTO world.City VALUES (NULL, 'Wrong value 2', '000', 'Wrong', 0) , (NULL, 'Wrong value 3', '000', 'Wrong', 0); +INSERT INTO world.city VALUES (NULL, 'Wrong value 1', '000', 'Wrong', 0); +INSERT INTO world.city VALUES (NULL, 'Wrong value 2', '000', 'Wrong', 0) , (NULL, 'Wrong value 3', '000', 'Wrong', 0); INSERT INTO test.test VALUES (NULL, 'Good record 2', CURRENT_TIMESTAMP()); -UPDATE world.City SET Population = 99999999 WHERE ID IN (1, 2, 3); +UPDATE world.city SET Population = 99999999 WHERE ID IN (1, 2, 3); INSERT INTO test.test VALUES (NULL, 'Good record 3', CURRENT_TIMESTAMP()); -DELETE FROM world.City WHERE ID BETWEEN 1 AND 2; +DELETE FROM world.city WHERE ID BETWEEN 1 AND 2; INSERT INTO test.test VALUES (NULL, 'Good record 5', CURRENT_TIMESTAMP()); -REPLACE INTO world.City VALUES (4074, 'Wrong value 4', '000', 'Wrong', 0); -REPLACE INTO world.City VALUES (4078, 'Wrong value 5', '000', 'Wrong', 0), (NULL, 'Wrong value 6', '000', 'Wrong', 0); +REPLACE INTO world.city VALUES (4074, 'Wrong value 4', '000', 'Wrong', 0); +REPLACE INTO world.city VALUES (4078, 'Wrong value 5', '000', 'Wrong', 0), (NULL, 'Wrong value 6', '000', 'Wrong', 0); INSERT INTO test.test VALUES (NULL, 'Good record 6', CURRENT_TIMESTAMP()); -INSERT INTO world.City -SELECT NULL, Name, CountryCode, District, Population FROM world.City WHERE ID BETWEEN 2 AND 10; +INSERT INTO world.city +SELECT NULL, Name, CountryCode, District, Population FROM world.city WHERE ID BETWEEN 2 AND 10; INSERT INTO test.test VALUES (NULL, 'Good record 7', CURRENT_TIMESTAMP()); INSERT INTO test.test VALUES (NULL, 'Good record 8', CURRENT_TIMESTAMP()); -DELETE FROM world.City; +DELETE FROM world.city; INSERT INTO test.test VALUES (NULL, 'Good record 9', CURRENT_TIMESTAMP()); FLUSH LOGS; # < CASE 6 > # Flashback & Check the result # -SELECT * FROM world.City; +SELECT * FROM world.city; ID Name CountryCode District Population 1 Davenport USA Iowa 100 2 Boulder USA Colorado 1000 @@ -668,11 +668,11 @@ ID REC ts 6 Good record 7 2001-09-09 09:46:40 7 Good record 8 2001-09-09 09:46:40 8 Good record 9 2001-09-09 09:46:40 -CHECKSUM TABLE world.City; +CHECKSUM TABLE world.city; Table Checksum -world.City 563256876 +world.city 563256876 DROP TABLE test.test; -DROP TABLE world.City; +DROP TABLE world.city; DROP DATABASE world; SET binlog_format=statement; Warnings: diff --git a/mysql-test/suite/binlog/t/flashback.test b/mysql-test/suite/binlog/t/flashback.test index 3636276a028..3fc8c44c60c 100644 --- a/mysql-test/suite/binlog/t/flashback.test +++ b/mysql-test/suite/binlog/t/flashback.test @@ -260,7 +260,7 @@ DROP TABLE t1; # Init Structure CREATE DATABASE world; -CREATE TABLE world.City ( +CREATE TABLE world.city ( ID INT AUTO_INCREMENT PRIMARY KEY, Name VARCHAR(64), CountryCode VARCHAR(64), @@ -273,43 +273,43 @@ CREATE TABLE test.test ( ts TIMESTAMP ) ENGINE=InnoDB; -INSERT INTO world.City VALUES (NULL, 'Davenport', 'USA', 'Iowa', 100); -INSERT INTO world.City VALUES (NULL, 'Boulder', 'USA', 'Colorado', 1000); -INSERT INTO world.City VALUES (NULL, 'Gweru', 'ZWE', 'Midlands', 10000); +INSERT INTO world.city VALUES (NULL, 'Davenport', 'USA', 'Iowa', 100); +INSERT INTO world.city VALUES (NULL, 'Boulder', 'USA', 'Colorado', 1000); +INSERT INTO world.city VALUES (NULL, 'Gweru', 'ZWE', 'Midlands', 10000); RESET MASTER; -CHECKSUM TABLE world.City; +CHECKSUM TABLE world.city; # Insert test data INSERT INTO test.test VALUES (NULL, 'Good record 1', CURRENT_TIMESTAMP()); -INSERT INTO world.City VALUES (NULL, 'Wrong value 1', '000', 'Wrong', 0); -INSERT INTO world.City VALUES (NULL, 'Wrong value 2', '000', 'Wrong', 0) , (NULL, 'Wrong value 3', '000', 'Wrong', 0); +INSERT INTO world.city VALUES (NULL, 'Wrong value 1', '000', 'Wrong', 0); +INSERT INTO world.city VALUES (NULL, 'Wrong value 2', '000', 'Wrong', 0) , (NULL, 'Wrong value 3', '000', 'Wrong', 0); INSERT INTO test.test VALUES (NULL, 'Good record 2', CURRENT_TIMESTAMP()); -UPDATE world.City SET Population = 99999999 WHERE ID IN (1, 2, 3); +UPDATE world.city SET Population = 99999999 WHERE ID IN (1, 2, 3); INSERT INTO test.test VALUES (NULL, 'Good record 3', CURRENT_TIMESTAMP()); -DELETE FROM world.City WHERE ID BETWEEN 1 AND 2; +DELETE FROM world.city WHERE ID BETWEEN 1 AND 2; INSERT INTO test.test VALUES (NULL, 'Good record 5', CURRENT_TIMESTAMP()); -REPLACE INTO world.City VALUES (4074, 'Wrong value 4', '000', 'Wrong', 0); -REPLACE INTO world.City VALUES (4078, 'Wrong value 5', '000', 'Wrong', 0), (NULL, 'Wrong value 6', '000', 'Wrong', 0); +REPLACE INTO world.city VALUES (4074, 'Wrong value 4', '000', 'Wrong', 0); +REPLACE INTO world.city VALUES (4078, 'Wrong value 5', '000', 'Wrong', 0), (NULL, 'Wrong value 6', '000', 'Wrong', 0); INSERT INTO test.test VALUES (NULL, 'Good record 6', CURRENT_TIMESTAMP()); -INSERT INTO world.City -SELECT NULL, Name, CountryCode, District, Population FROM world.City WHERE ID BETWEEN 2 AND 10; +INSERT INTO world.city +SELECT NULL, Name, CountryCode, District, Population FROM world.city WHERE ID BETWEEN 2 AND 10; INSERT INTO test.test VALUES (NULL, 'Good record 7', CURRENT_TIMESTAMP()); INSERT INTO test.test VALUES (NULL, 'Good record 8', CURRENT_TIMESTAMP()); -DELETE FROM world.City; +DELETE FROM world.city; INSERT INTO test.test VALUES (NULL, 'Good record 9', CURRENT_TIMESTAMP()); @@ -321,18 +321,18 @@ FLUSH LOGS; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---exec $MYSQL_BINLOG --database=world --table=City -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_original_6.sql ---exec $MYSQL_BINLOG --database=world --table=City -B $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_6.sql +--exec $MYSQL_BINLOG --database=world --table=city -vv $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_original_6.sql +--exec $MYSQL_BINLOG --database=world --table=city -B $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_6.sql --exec $MYSQL -e "SET binlog_format= ROW; source $MYSQLTEST_VARDIR/tmp/mysqlbinlog_row_flashback_6.sql;" -SELECT * FROM world.City; +SELECT * FROM world.city; SELECT * FROM test.test; -CHECKSUM TABLE world.City; +CHECKSUM TABLE world.city; DROP TABLE test.test; -DROP TABLE world.City; +DROP TABLE world.city; DROP DATABASE world; ## Clear diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result b/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result index 852b300332b..884408d29b3 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result @@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` ( `c2` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 ANALYZE PARTITION p1,p2; Table Op Msg_type Msg_text test.t1 analyze status OK @@ -48,13 +48,13 @@ t1 CREATE TABLE `t1` ( `c2` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result b/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result index 805e4637928..93208147dc4 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result @@ -34,7 +34,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -56,7 +56,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -97,7 +97,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -119,7 +119,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -160,7 +160,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -182,7 +182,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -223,7 +223,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -245,7 +245,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -286,7 +286,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -308,7 +308,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -349,7 +349,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -371,7 +371,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -412,7 +412,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -434,7 +434,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -475,7 +475,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -497,7 +497,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -538,7 +538,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -560,7 +560,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -601,7 +601,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -623,7 +623,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -664,7 +664,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -686,7 +686,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -727,7 +727,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 ALTER TABLE t1 COALESCE PARTITION 2; SELECT * FROM t1 ORDER BY c1; @@ -749,7 +749,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_check.result b/mysql-test/suite/engines/funcs/r/tc_partition_check.result index f2e10ec2a06..79592633197 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_check.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_check.result @@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` ( `c2` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 CHECK PARTITION p1,p2; Table Op Msg_type Msg_text test.t1 check status OK @@ -48,13 +48,13 @@ t1 CREATE TABLE `t1` ( `c2` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_hash.result b/mysql-test/suite/engines/funcs/r/tc_partition_hash.result index 8c29eb32d90..e7ac578fbfe 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_hash.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_hash.result @@ -9,7 +9,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -24,7 +24,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -39,7 +39,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -54,7 +54,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -69,7 +69,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -84,7 +84,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -99,7 +99,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -114,7 +114,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -129,7 +129,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -144,7 +144,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -159,7 +159,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -174,7 +174,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 1 DROP TABLE t1; SHOW TABLES; @@ -189,7 +189,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -204,7 +204,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -219,7 +219,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -234,7 +234,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -249,7 +249,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -264,7 +264,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -279,7 +279,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -294,7 +294,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -309,7 +309,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -324,7 +324,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -339,7 +339,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -354,7 +354,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -369,7 +369,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -384,7 +384,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -399,7 +399,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -414,7 +414,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -429,7 +429,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -444,7 +444,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -459,7 +459,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -474,7 +474,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -489,7 +489,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -504,7 +504,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -519,7 +519,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -534,7 +534,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 3 DROP TABLE t1; SHOW TABLES; @@ -549,7 +549,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -564,7 +564,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -579,7 +579,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -594,7 +594,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -609,7 +609,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -624,7 +624,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -639,7 +639,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -654,7 +654,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -669,7 +669,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -684,7 +684,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -699,7 +699,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -714,7 +714,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -729,7 +729,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -744,7 +744,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -759,7 +759,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -774,7 +774,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -789,7 +789,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -804,7 +804,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -819,7 +819,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -834,7 +834,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -849,7 +849,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -864,7 +864,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -879,7 +879,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -894,7 +894,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -909,7 +909,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -924,7 +924,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -939,7 +939,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -954,7 +954,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -969,7 +969,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -984,7 +984,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -999,7 +999,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -1014,7 +1014,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -1029,7 +1029,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -1044,7 +1044,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -1059,7 +1059,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -1074,7 +1074,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 DROP TABLE t1; SHOW TABLES; @@ -1089,7 +1089,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1104,7 +1104,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1119,7 +1119,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1134,7 +1134,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1149,7 +1149,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1164,7 +1164,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1179,7 +1179,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1194,7 +1194,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1209,7 +1209,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1224,7 +1224,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1239,7 +1239,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; @@ -1254,7 +1254,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 50 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result b/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result index 368ba8c0249..96725b7328a 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result @@ -10,7 +10,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -25,7 +25,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -40,7 +40,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -55,7 +55,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -70,7 +70,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -85,7 +85,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -100,7 +100,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -115,7 +115,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -130,7 +130,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -145,7 +145,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -160,7 +160,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -175,7 +175,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (YEAR(c3)) + PARTITION BY HASH (year(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -190,7 +190,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -205,7 +205,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -220,7 +220,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -235,7 +235,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -250,7 +250,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -265,7 +265,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -280,7 +280,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -295,7 +295,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -310,7 +310,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -325,7 +325,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -340,7 +340,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -355,7 +355,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (MONTH(c3)) + PARTITION BY HASH (month(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -370,7 +370,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -385,7 +385,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -400,7 +400,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -415,7 +415,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -430,7 +430,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -445,7 +445,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -460,7 +460,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -475,7 +475,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -490,7 +490,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -505,7 +505,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -520,7 +520,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -535,7 +535,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAY(c3)) + PARTITION BY HASH (dayofmonth(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -550,7 +550,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -565,7 +565,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -580,7 +580,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -595,7 +595,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -610,7 +610,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -625,7 +625,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -640,7 +640,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -655,7 +655,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -670,7 +670,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -685,7 +685,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -700,7 +700,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test @@ -715,7 +715,7 @@ t2 CREATE TABLE `t2` ( `c2` char(5) DEFAULT NULL, `c3` datetime DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (DAYOFWEEK(c3)) + PARTITION BY HASH (dayofweek(`c3`)) DROP TABLE t2; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_key.result b/mysql-test/suite/engines/funcs/r/tc_partition_key.result index 9ca335be0e2..9286b5d9649 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_key.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_key.result @@ -9,7 +9,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -24,7 +24,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -39,7 +39,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -54,7 +54,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -69,7 +69,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -84,7 +84,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -99,7 +99,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -114,7 +114,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -129,7 +129,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -144,7 +144,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -159,7 +159,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -174,7 +174,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -189,7 +189,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -204,7 +204,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -219,7 +219,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -234,7 +234,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -249,7 +249,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -264,7 +264,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -279,7 +279,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -294,7 +294,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -309,7 +309,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -324,7 +324,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -339,7 +339,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -354,7 +354,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -369,7 +369,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -384,7 +384,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -399,7 +399,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -414,7 +414,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -429,7 +429,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -444,7 +444,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -459,7 +459,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -474,7 +474,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -489,7 +489,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -504,7 +504,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -519,7 +519,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -534,7 +534,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -549,7 +549,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -564,7 +564,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -579,7 +579,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -594,7 +594,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -609,7 +609,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -624,7 +624,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -639,7 +639,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -654,7 +654,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -669,7 +669,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -684,7 +684,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -699,7 +699,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -714,7 +714,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result b/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result index 0a560743832..2eb32646f9f 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result @@ -9,7 +9,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -24,7 +24,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -39,7 +39,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -54,7 +54,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -69,7 +69,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -84,7 +84,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -99,7 +99,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -114,7 +114,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -129,7 +129,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -144,7 +144,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -159,7 +159,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -174,7 +174,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -189,7 +189,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -204,7 +204,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -219,7 +219,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -234,7 +234,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -249,7 +249,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -264,7 +264,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -279,7 +279,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -294,7 +294,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -309,7 +309,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -324,7 +324,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -339,7 +339,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -354,7 +354,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 4 DROP TABLE t1; SHOW TABLES; @@ -369,7 +369,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -384,7 +384,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -399,7 +399,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -414,7 +414,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -429,7 +429,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -444,7 +444,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -459,7 +459,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -474,7 +474,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -489,7 +489,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -504,7 +504,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -519,7 +519,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -534,7 +534,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 5 DROP TABLE t1; SHOW TABLES; @@ -549,7 +549,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -564,7 +564,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -579,7 +579,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -594,7 +594,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -609,7 +609,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -624,7 +624,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -639,7 +639,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -654,7 +654,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -669,7 +669,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -684,7 +684,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -699,7 +699,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; @@ -714,7 +714,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 99 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result b/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result index c30705c8194..0eb1143ca47 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result @@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` ( `c2` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 OPTIMIZE PARTITION p1,p2; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -46,13 +46,13 @@ t1 CREATE TABLE `t1` ( `c2` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result b/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result index bef7ba0635d..9f63c022f36 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result @@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` ( `c2` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 REBUILD PARTITION p1,p2; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -46,13 +46,13 @@ t1 CREATE TABLE `t1` ( `c2` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_remove.result b/mysql-test/suite/engines/funcs/r/tc_partition_remove.result index 3ae3439f83c..fcf489d2763 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_remove.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_remove.result @@ -21,7 +21,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -60,7 +60,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -99,7 +99,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -138,7 +138,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -177,7 +177,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -216,7 +216,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -259,7 +259,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -298,7 +298,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -337,7 +337,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -376,7 +376,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -415,7 +415,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -454,7 +454,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) ALTER TABLE t1 REMOVE PARTITIONING; SELECT * FROM t1 ORDER BY c1; c1 c2 diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result index 517c16083b3..22463593106 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result @@ -44,12 +44,12 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION s2; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION s1; @@ -71,11 +71,11 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -125,12 +125,12 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION s2; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION s1; @@ -152,11 +152,11 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -206,12 +206,12 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION s2; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION s1; @@ -233,11 +233,11 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -287,12 +287,12 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION s2; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION s1; @@ -314,11 +314,11 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -368,12 +368,12 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION s2; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION s1; @@ -395,11 +395,11 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -449,12 +449,12 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION s2; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION s1; @@ -476,11 +476,11 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result index 18f07127cb3..e43e95e928e 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result @@ -19,7 +19,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -41,7 +41,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SHOW TABLES; @@ -63,7 +63,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -71,7 +71,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -97,7 +97,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -119,7 +119,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -141,7 +141,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -149,7 +149,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -175,7 +175,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -197,7 +197,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -219,7 +219,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -227,7 +227,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -253,7 +253,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -275,7 +275,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -297,7 +297,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -305,7 +305,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -331,7 +331,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -353,7 +353,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -375,7 +375,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -383,7 +383,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -409,7 +409,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -431,7 +431,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -453,7 +453,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -461,7 +461,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY HASH (c1) + PARTITION BY HASH (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -487,7 +487,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -509,7 +509,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -531,7 +531,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -539,7 +539,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -565,7 +565,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -587,7 +587,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -609,7 +609,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -617,7 +617,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -643,7 +643,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -665,7 +665,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -687,7 +687,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -695,7 +695,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -721,7 +721,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -743,7 +743,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -765,7 +765,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -773,7 +773,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -799,7 +799,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -821,7 +821,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -843,7 +843,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -851,7 +851,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -877,7 +877,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -899,7 +899,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -921,7 +921,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -929,7 +929,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY KEY (c1) + PARTITION BY KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -955,7 +955,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -977,7 +977,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -999,7 +999,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -1007,7 +1007,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -1033,7 +1033,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -1055,7 +1055,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -1077,7 +1077,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -1085,7 +1085,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -1111,7 +1111,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -1133,7 +1133,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -1155,7 +1155,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -1163,7 +1163,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -1189,7 +1189,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -1211,7 +1211,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -1233,7 +1233,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -1241,7 +1241,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -1267,7 +1267,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -1289,7 +1289,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -1311,7 +1311,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -1319,7 +1319,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; @@ -1345,7 +1345,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 10 ALTER TABLE t1 ADD PARTITION PARTITIONS 10; SELECT * FROM t1 ORDER BY c1; @@ -1367,7 +1367,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 20 ALTER TABLE t1 COALESCE PARTITION 18; SELECT * FROM t1 ORDER BY c1; @@ -1389,7 +1389,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 SHOW CREATE TABLE t1; Table Create Table @@ -1397,7 +1397,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LINEAR KEY (c1) + PARTITION BY LINEAR KEY (`c1`) PARTITIONS 2 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result index 618b8dd2465..89681d5ec65 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result @@ -41,10 +41,10 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION m1; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION m0; @@ -63,9 +63,9 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -112,10 +112,10 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION m1; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION m0; @@ -134,9 +134,9 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -183,10 +183,10 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION m1; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION m0; @@ -205,9 +205,9 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -254,10 +254,10 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION m1; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION m0; @@ -276,9 +276,9 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -325,10 +325,10 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION m1; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION m0; @@ -347,9 +347,9 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -396,10 +396,10 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 DROP PARTITION m1; ERROR HY000: Error in list of partitions to DROP ALTER TABLE t1 DROP PARTITION m0; @@ -418,9 +418,9 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` char(5) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( c1) -(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_repair.result b/mysql-test/suite/engines/funcs/r/tc_partition_repair.result index 98d9aa93740..d51bd86b715 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_repair.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_repair.result @@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` ( `c2` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) ALTER TABLE t1 REPAIR PARTITION p1,p2; SELECT * FROM t1 ORDER BY c1; c1 c2 @@ -46,13 +46,13 @@ t1 CREATE TABLE `t1` ( `c2` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result b/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result index 6d1dc41a354..be47aaadd40 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result @@ -45,12 +45,12 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) SUBPARTITIONS 2 -(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) +(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -100,12 +100,12 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) SUBPARTITIONS 2 -(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) +(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -155,12 +155,12 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) SUBPARTITIONS 2 -(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) +(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -210,12 +210,12 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) SUBPARTITIONS 2 -(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) +(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -265,12 +265,12 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) SUBPARTITIONS 2 -(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) +(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -320,12 +320,12 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) SUBPARTITIONS 2 -(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) +(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result b/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result index c6a0d9aac68..543b3471092 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result @@ -53,17 +53,17 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) -(PARTITION p0 VALUES LESS THAN (1990) - (SUBPARTITION s0 ENGINE = ENGINE, - SUBPARTITION s1 ENGINE = ENGINE), - PARTITION p1 VALUES LESS THAN (2000) - (SUBPARTITION s2 ENGINE = ENGINE, - SUBPARTITION s3 ENGINE = ENGINE), - PARTITION p2 VALUES LESS THAN MAXVALUE - (SUBPARTITION s4 ENGINE = ENGINE, - SUBPARTITION s5 ENGINE = ENGINE)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) +(PARTITION `p0` VALUES LESS THAN (1990) + (SUBPARTITION `s0` ENGINE = ENGINE, + SUBPARTITION `s1` ENGINE = ENGINE), + PARTITION `p1` VALUES LESS THAN (2000) + (SUBPARTITION `s2` ENGINE = ENGINE, + SUBPARTITION `s3` ENGINE = ENGINE), + PARTITION `p2` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s4` ENGINE = ENGINE, + SUBPARTITION `s5` ENGINE = ENGINE)) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -121,17 +121,17 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) -(PARTITION p0 VALUES LESS THAN (1990) - (SUBPARTITION s0 ENGINE = ENGINE, - SUBPARTITION s1 ENGINE = ENGINE), - PARTITION p1 VALUES LESS THAN (2000) - (SUBPARTITION s2 ENGINE = ENGINE, - SUBPARTITION s3 ENGINE = ENGINE), - PARTITION p2 VALUES LESS THAN MAXVALUE - (SUBPARTITION s4 ENGINE = ENGINE, - SUBPARTITION s5 ENGINE = ENGINE)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) +(PARTITION `p0` VALUES LESS THAN (1990) + (SUBPARTITION `s0` ENGINE = ENGINE, + SUBPARTITION `s1` ENGINE = ENGINE), + PARTITION `p1` VALUES LESS THAN (2000) + (SUBPARTITION `s2` ENGINE = ENGINE, + SUBPARTITION `s3` ENGINE = ENGINE), + PARTITION `p2` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s4` ENGINE = ENGINE, + SUBPARTITION `s5` ENGINE = ENGINE)) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -189,17 +189,17 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) -(PARTITION p0 VALUES LESS THAN (1990) - (SUBPARTITION s0 ENGINE = ENGINE, - SUBPARTITION s1 ENGINE = ENGINE), - PARTITION p1 VALUES LESS THAN (2000) - (SUBPARTITION s2 ENGINE = ENGINE, - SUBPARTITION s3 ENGINE = ENGINE), - PARTITION p2 VALUES LESS THAN MAXVALUE - (SUBPARTITION s4 ENGINE = ENGINE, - SUBPARTITION s5 ENGINE = ENGINE)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) +(PARTITION `p0` VALUES LESS THAN (1990) + (SUBPARTITION `s0` ENGINE = ENGINE, + SUBPARTITION `s1` ENGINE = ENGINE), + PARTITION `p1` VALUES LESS THAN (2000) + (SUBPARTITION `s2` ENGINE = ENGINE, + SUBPARTITION `s3` ENGINE = ENGINE), + PARTITION `p2` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s4` ENGINE = ENGINE, + SUBPARTITION `s5` ENGINE = ENGINE)) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -257,17 +257,17 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) -(PARTITION p0 VALUES LESS THAN (1990) - (SUBPARTITION s0 ENGINE = ENGINE, - SUBPARTITION s1 ENGINE = ENGINE), - PARTITION p1 VALUES LESS THAN (2000) - (SUBPARTITION s2 ENGINE = ENGINE, - SUBPARTITION s3 ENGINE = ENGINE), - PARTITION p2 VALUES LESS THAN MAXVALUE - (SUBPARTITION s4 ENGINE = ENGINE, - SUBPARTITION s5 ENGINE = ENGINE)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) +(PARTITION `p0` VALUES LESS THAN (1990) + (SUBPARTITION `s0` ENGINE = ENGINE, + SUBPARTITION `s1` ENGINE = ENGINE), + PARTITION `p1` VALUES LESS THAN (2000) + (SUBPARTITION `s2` ENGINE = ENGINE, + SUBPARTITION `s3` ENGINE = ENGINE), + PARTITION `p2` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s4` ENGINE = ENGINE, + SUBPARTITION `s5` ENGINE = ENGINE)) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -325,17 +325,17 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) -(PARTITION p0 VALUES LESS THAN (1990) - (SUBPARTITION s0 ENGINE = ENGINE, - SUBPARTITION s1 ENGINE = ENGINE), - PARTITION p1 VALUES LESS THAN (2000) - (SUBPARTITION s2 ENGINE = ENGINE, - SUBPARTITION s3 ENGINE = ENGINE), - PARTITION p2 VALUES LESS THAN MAXVALUE - (SUBPARTITION s4 ENGINE = ENGINE, - SUBPARTITION s5 ENGINE = ENGINE)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) +(PARTITION `p0` VALUES LESS THAN (1990) + (SUBPARTITION `s0` ENGINE = ENGINE, + SUBPARTITION `s1` ENGINE = ENGINE), + PARTITION `p1` VALUES LESS THAN (2000) + (SUBPARTITION `s2` ENGINE = ENGINE, + SUBPARTITION `s3` ENGINE = ENGINE), + PARTITION `p2` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s4` ENGINE = ENGINE, + SUBPARTITION `s5` ENGINE = ENGINE)) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -393,17 +393,17 @@ t1 CREATE TABLE `t1` ( `name` varchar(30) DEFAULT NULL, `purchased` date DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) -(PARTITION p0 VALUES LESS THAN (1990) - (SUBPARTITION s0 ENGINE = ENGINE, - SUBPARTITION s1 ENGINE = ENGINE), - PARTITION p1 VALUES LESS THAN (2000) - (SUBPARTITION s2 ENGINE = ENGINE, - SUBPARTITION s3 ENGINE = ENGINE), - PARTITION p2 VALUES LESS THAN MAXVALUE - (SUBPARTITION s4 ENGINE = ENGINE, - SUBPARTITION s5 ENGINE = ENGINE)) + PARTITION BY RANGE (year(`purchased`)) +SUBPARTITION BY HASH (to_days(`purchased`)) +(PARTITION `p0` VALUES LESS THAN (1990) + (SUBPARTITION `s0` ENGINE = ENGINE, + SUBPARTITION `s1` ENGINE = ENGINE), + PARTITION `p1` VALUES LESS THAN (2000) + (SUBPARTITION `s2` ENGINE = ENGINE, + SUBPARTITION `s3` ENGINE = ENGINE), + PARTITION `p2` VALUES LESS THAN MAXVALUE + (SUBPARTITION `s4` ENGINE = ENGINE, + SUBPARTITION `s5` ENGINE = ENGINE)) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_value.result b/mysql-test/suite/engines/funcs/r/tc_partition_value.result index 98a5f885e4b..48891fc368d 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_value.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_value.result @@ -15,13 +15,13 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` int(11) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -41,13 +41,13 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` int(11) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -67,13 +67,13 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` int(11) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -93,13 +93,13 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` int(11) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -119,13 +119,13 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` int(11) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY RANGE (c1) -(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE, - PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE, - PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE, - PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE, - PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE, - PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) + PARTITION BY RANGE (`c1`) +(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE, + PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE, + PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE, + PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE, + PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE, + PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result b/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result index 71a38814fd8..0d9393ffeda 100644 --- a/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result +++ b/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result @@ -13,11 +13,11 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) DEFAULT NULL, `c2` int(11) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LIST (c1) -(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE, - PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE, - PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE, - PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) + PARTITION BY LIST (`c1`) +(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE, + PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE, + PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE, + PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -35,11 +35,11 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) DEFAULT NULL, `c2` int(11) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LIST (c1) -(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE, - PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE, - PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE, - PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) + PARTITION BY LIST (`c1`) +(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE, + PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE, + PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE, + PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -57,11 +57,11 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` int(11) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LIST (c1) -(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE, - PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE, - PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE, - PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) + PARTITION BY LIST (`c1`) +(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE, + PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE, + PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE, + PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -79,11 +79,11 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` int(11) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LIST (c1) -(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE, - PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE, - PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE, - PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) + PARTITION BY LIST (`c1`) +(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE, + PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE, + PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE, + PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -101,11 +101,11 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) DEFAULT NULL, `c2` int(11) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 - PARTITION BY LIST (c1) -(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE, - PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE, - PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE, - PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) + PARTITION BY LIST (`c1`) +(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE, + PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE, + PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE, + PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) DROP TABLE t1; SHOW TABLES; Tables_in_test diff --git a/mysql-test/suite/parts/r/longname.result b/mysql-test/suite/parts/r/longname.result new file mode 100644 index 00000000000..c95e666625e --- /dev/null +++ b/mysql-test/suite/parts/r/longname.result @@ -0,0 +1,28 @@ +set names utf8; +create database mysqltest1; +select database_name, table_name, length(table_name) from mysql.innodb_table_stats where database_name = 'mysqltest1'; +database_name table_name length(table_name) +CREATE TABLE mysqltest1.test_jfg_table_name_with_64_chars_123456789012345678901234567890 ( +id int(10) unsigned NOT NULL, +id2 int(10) unsigned NOT NULL, +PRIMARY KEY ( id, id2 ) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC +PARTITION BY RANGE ( id ) +SUBPARTITION BY HASH ( id2 ) +SUBPARTITIONS 2 ( +PARTITION test_jfg_partition_name_with_60_chars_1234567890123456789012 VALUES LESS THAN (1000) ENGINE = InnoDB, +PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB); +select database_name, table_name, length(table_name) from mysql.innodb_table_stats where database_name = 'mysqltest1'; +database_name table_name length(table_name) +CREATE TABLE mysqltest1.éééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé ( +id int(10) unsigned NOT NULL, +id2 int(10) unsigned NOT NULL, +PRIMARY KEY ( id, id2 ) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC +PARTITION BY RANGE ( id ) +SUBPARTITION BY HASH ( id2 ) +SUBPARTITIONS 2 ( +PARTITION çççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç VALUES LESS THAN (1000) ENGINE = InnoDB, +PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB); +ERROR HY000: The path specified for @0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@ is too long +drop database mysqltest1; diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result b/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result index d25371615ef..a1dad1b34b3 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result @@ -56,14 +56,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = InnoDB, - PARTITION partB ENGINE = InnoDB, - PARTITION Partc ENGINE = InnoDB, - PARTITION PartD ENGINE = InnoDB, - PARTITION partE ENGINE = InnoDB, - PARTITION Partf ENGINE = InnoDB, - PARTITION PartG ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = InnoDB, + PARTITION `partB` ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB, + PARTITION `PartD` ENGINE = InnoDB, + PARTITION `partE` ENGINE = InnoDB, + PARTITION `Partf` ENGINE = InnoDB, + PARTITION `PartG` ENGINE = InnoDB) ALTER TABLE TableA COALESCE PARTITION 4; SELECT * FROM TableA; a @@ -84,10 +84,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = InnoDB, - PARTITION partB ENGINE = InnoDB, - PARTITION Partc ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = InnoDB, + PARTITION `partB` ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB) # Test of EXCHANGE PARTITION WITH TABLE SELECT PARTITION_NAME, TABLE_ROWS FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA ='MySQL_Test_DB' AND TABLE_NAME = 'TableA'; PARTITION_NAME TABLE_ROWS @@ -112,10 +112,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = InnoDB, - PARTITION partB ENGINE = InnoDB, - PARTITION Partc ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = InnoDB, + PARTITION `partB` ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB) SELECT * FROM TableB; a 10 @@ -156,10 +156,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = InnoDB, - PARTITION partB ENGINE = InnoDB, - PARTITION Partc ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = InnoDB, + PARTITION `partB` ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB) # Test of REORGANIZE PARTITIONS # Should not work on HASH/KEY ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO @@ -192,10 +192,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB, - PARTITION Partc ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = InnoDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -264,10 +264,10 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB, - PARTITION Partc ENGINE = InnoDB) + PARTITION BY KEY (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = InnoDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -355,14 +355,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = InnoDB, - PARTITION partB ENGINE = InnoDB, - PARTITION Partc ENGINE = InnoDB, - PARTITION PartD ENGINE = InnoDB, - PARTITION partE ENGINE = InnoDB, - PARTITION Partf ENGINE = InnoDB, - PARTITION PartG ENGINE = InnoDB) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = InnoDB, + PARTITION `partB` ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB, + PARTITION `PartD` ENGINE = InnoDB, + PARTITION `partE` ENGINE = InnoDB, + PARTITION `Partf` ENGINE = InnoDB, + PARTITION `PartG` ENGINE = InnoDB) ALTER TABLE TableA COALESCE PARTITION 4; SELECT * FROM TableA; a @@ -383,10 +383,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = InnoDB, - PARTITION partB ENGINE = InnoDB, - PARTITION Partc ENGINE = InnoDB) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = InnoDB, + PARTITION `partB` ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB) # Test of REORGANIZE PARTITIONS # Should not work on HASH/KEY ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO @@ -419,10 +419,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB, - PARTITION Partc ENGINE = InnoDB) + PARTITION BY HASH (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = InnoDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -491,10 +491,10 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB, - PARTITION Partc ENGINE = InnoDB) + PARTITION BY HASH (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = InnoDB, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = InnoDB, + PARTITION `Partc` ENGINE = InnoDB) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -571,14 +571,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB, - PARTITION partB VALUES LESS THAN (7) ENGINE = InnoDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION PartD VALUES LESS THAN (13) ENGINE = InnoDB, - PARTITION partE VALUES LESS THAN (16) ENGINE = InnoDB, - PARTITION Partf VALUES LESS THAN (19) ENGINE = InnoDB, - PARTITION PartG VALUES LESS THAN (22) ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = InnoDB, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = InnoDB, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = InnoDB, + PARTITION `partE` VALUES LESS THAN (16) ENGINE = InnoDB, + PARTITION `Partf` VALUES LESS THAN (19) ENGINE = InnoDB, + PARTITION `PartG` VALUES LESS THAN (22) ENGINE = InnoDB) ALTER TABLE TableA DROP PARTITION partE, PartG; ALTER TABLE TableA DROP PARTITION Partf; ALTER TABLE TableA ADD PARTITION @@ -602,12 +602,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB, - PARTITION partB VALUES LESS THAN (7) ENGINE = InnoDB, - PARTITION Partc VALUES LESS THAN (10) ENGINE = InnoDB, - PARTITION PartD VALUES LESS THAN (13) ENGINE = InnoDB, - PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = InnoDB, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = InnoDB, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = InnoDB, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = InnoDB, + PARTITION `PartE` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) # Test of REORGANIZE PARTITIONS # Error since it must reorganize a consecutive range ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO @@ -640,11 +640,11 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB, - PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = InnoDB, - PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = InnoDB, - PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = InnoDB, + PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = InnoDB, + PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = InnoDB, + PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = InnoDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -713,11 +713,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB, - PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = InnoDB, - PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = InnoDB, - PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = InnoDB, + PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = InnoDB, + PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = InnoDB, + PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = InnoDB) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -794,14 +794,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = InnoDB, - PARTITION partB VALUES IN (2,10,11) ENGINE = InnoDB, - PARTITION Partc VALUES IN (3,4,7) ENGINE = InnoDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB, - PARTITION partE VALUES IN (16) ENGINE = InnoDB, - PARTITION Partf VALUES IN (19) ENGINE = InnoDB, - PARTITION PartG VALUES IN (22) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = InnoDB, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = InnoDB, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = InnoDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = InnoDB, + PARTITION `partE` VALUES IN (16) ENGINE = InnoDB, + PARTITION `Partf` VALUES IN (19) ENGINE = InnoDB, + PARTITION `PartG` VALUES IN (22) ENGINE = InnoDB) ALTER TABLE TableA DROP PARTITION partE, PartG; ALTER TABLE TableA DROP PARTITION Partf; ALTER TABLE TableA ADD PARTITION @@ -825,12 +825,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = InnoDB, - PARTITION partB VALUES IN (2,10,11) ENGINE = InnoDB, - PARTITION Partc VALUES IN (3,4,7) ENGINE = InnoDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB, - PARTITION PartE VALUES IN (13) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = InnoDB, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = InnoDB, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = InnoDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = InnoDB, + PARTITION `PartE` VALUES IN (13) ENGINE = InnoDB) # Test of REORGANIZE PARTITIONS ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO (PARTITION Partc VALUES IN (1,7) @@ -863,12 +863,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = InnoDB, - PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = InnoDB, - PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = InnoDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB, - PARTITION PartE VALUES IN (13) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = InnoDB, + PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = InnoDB, + PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = InnoDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = InnoDB, + PARTITION `PartE` VALUES IN (13) ENGINE = InnoDB) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -928,12 +928,12 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = InnoDB, - PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = InnoDB, - PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = InnoDB, - PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB, - PARTITION PartE VALUES IN (13) ENGINE = InnoDB) + PARTITION BY LIST (`a`) +(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = InnoDB, + PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = InnoDB, + PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = InnoDB, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = InnoDB, + PARTITION `PartE` VALUES IN (13) ENGINE = InnoDB) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -971,10 +971,10 @@ t1 CREATE TABLE `t1` ( `b` varchar(255) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=InnoDB AUTO_INCREMENT=2002 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION LT1000 VALUES LESS THAN (1000) ENGINE = InnoDB, - PARTITION LT2000 VALUES LESS THAN (2000) ENGINE = InnoDB, - PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = InnoDB) + PARTITION BY RANGE (`a`) +(PARTITION `LT1000` VALUES LESS THAN (1000) ENGINE = InnoDB, + PARTITION `LT2000` VALUES LESS THAN (2000) ENGINE = InnoDB, + PARTITION `MAX` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) SELECT * FROM t1 ORDER BY a; a b 1 First diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result b/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result index 076079ccb00..88f59da8f13 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result @@ -56,14 +56,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = MEMORY, - PARTITION partB ENGINE = MEMORY, - PARTITION Partc ENGINE = MEMORY, - PARTITION PartD ENGINE = MEMORY, - PARTITION partE ENGINE = MEMORY, - PARTITION Partf ENGINE = MEMORY, - PARTITION PartG ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = MEMORY, + PARTITION `partB` ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY, + PARTITION `PartD` ENGINE = MEMORY, + PARTITION `partE` ENGINE = MEMORY, + PARTITION `Partf` ENGINE = MEMORY, + PARTITION `PartG` ENGINE = MEMORY) ALTER TABLE TableA COALESCE PARTITION 4; SELECT * FROM TableA; a @@ -84,10 +84,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = MEMORY, - PARTITION partB ENGINE = MEMORY, - PARTITION Partc ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = MEMORY, + PARTITION `partB` ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY) # Test of EXCHANGE PARTITION WITH TABLE SELECT PARTITION_NAME, TABLE_ROWS FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA ='MySQL_Test_DB' AND TABLE_NAME = 'TableA'; PARTITION_NAME TABLE_ROWS @@ -112,10 +112,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = MEMORY, - PARTITION partB ENGINE = MEMORY, - PARTITION Partc ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = MEMORY, + PARTITION `partB` ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY) SELECT * FROM TableB; a 10 @@ -156,10 +156,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = MEMORY, - PARTITION partB ENGINE = MEMORY, - PARTITION Partc ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = MEMORY, + PARTITION `partB` ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY) # Test of REORGANIZE PARTITIONS # Should not work on HASH/KEY ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO @@ -192,10 +192,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY, - PARTITION Partc ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MEMORY, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -264,10 +264,10 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY, - PARTITION Partc ENGINE = MEMORY) + PARTITION BY KEY (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MEMORY, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -355,14 +355,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = MEMORY, - PARTITION partB ENGINE = MEMORY, - PARTITION Partc ENGINE = MEMORY, - PARTITION PartD ENGINE = MEMORY, - PARTITION partE ENGINE = MEMORY, - PARTITION Partf ENGINE = MEMORY, - PARTITION PartG ENGINE = MEMORY) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = MEMORY, + PARTITION `partB` ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY, + PARTITION `PartD` ENGINE = MEMORY, + PARTITION `partE` ENGINE = MEMORY, + PARTITION `Partf` ENGINE = MEMORY, + PARTITION `PartG` ENGINE = MEMORY) ALTER TABLE TableA COALESCE PARTITION 4; SELECT * FROM TableA; a @@ -383,10 +383,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = MEMORY, - PARTITION partB ENGINE = MEMORY, - PARTITION Partc ENGINE = MEMORY) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = MEMORY, + PARTITION `partB` ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY) # Test of REORGANIZE PARTITIONS # Should not work on HASH/KEY ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO @@ -419,10 +419,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY, - PARTITION Partc ENGINE = MEMORY) + PARTITION BY HASH (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MEMORY, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -491,10 +491,10 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY, - PARTITION Partc ENGINE = MEMORY) + PARTITION BY HASH (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MEMORY, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MEMORY, + PARTITION `Partc` ENGINE = MEMORY) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -571,14 +571,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = MEMORY, - PARTITION partB VALUES LESS THAN (7) ENGINE = MEMORY, - PARTITION Partc VALUES LESS THAN (10) ENGINE = MEMORY, - PARTITION PartD VALUES LESS THAN (13) ENGINE = MEMORY, - PARTITION partE VALUES LESS THAN (16) ENGINE = MEMORY, - PARTITION Partf VALUES LESS THAN (19) ENGINE = MEMORY, - PARTITION PartG VALUES LESS THAN (22) ENGINE = MEMORY) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MEMORY, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = MEMORY, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = MEMORY, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = MEMORY, + PARTITION `partE` VALUES LESS THAN (16) ENGINE = MEMORY, + PARTITION `Partf` VALUES LESS THAN (19) ENGINE = MEMORY, + PARTITION `PartG` VALUES LESS THAN (22) ENGINE = MEMORY) ALTER TABLE TableA DROP PARTITION partE, PartG; ALTER TABLE TableA DROP PARTITION Partf; ALTER TABLE TableA ADD PARTITION @@ -602,12 +602,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = MEMORY, - PARTITION partB VALUES LESS THAN (7) ENGINE = MEMORY, - PARTITION Partc VALUES LESS THAN (10) ENGINE = MEMORY, - PARTITION PartD VALUES LESS THAN (13) ENGINE = MEMORY, - PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = MEMORY) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MEMORY, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = MEMORY, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = MEMORY, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = MEMORY, + PARTITION `PartE` VALUES LESS THAN MAXVALUE ENGINE = MEMORY) # Test of REORGANIZE PARTITIONS # Error since it must reorganize a consecutive range ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO @@ -640,11 +640,11 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = MEMORY, - PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MEMORY, - PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MEMORY, - PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MEMORY) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MEMORY, + PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MEMORY, + PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MEMORY, + PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MEMORY) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -713,11 +713,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = MEMORY, - PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MEMORY, - PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MEMORY, - PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MEMORY) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MEMORY, + PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MEMORY, + PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MEMORY, + PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MEMORY) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -794,14 +794,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = MEMORY, - PARTITION partB VALUES IN (2,10,11) ENGINE = MEMORY, - PARTITION Partc VALUES IN (3,4,7) ENGINE = MEMORY, - PARTITION PartD VALUES IN (5,6,12) ENGINE = MEMORY, - PARTITION partE VALUES IN (16) ENGINE = MEMORY, - PARTITION Partf VALUES IN (19) ENGINE = MEMORY, - PARTITION PartG VALUES IN (22) ENGINE = MEMORY) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = MEMORY, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = MEMORY, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = MEMORY, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MEMORY, + PARTITION `partE` VALUES IN (16) ENGINE = MEMORY, + PARTITION `Partf` VALUES IN (19) ENGINE = MEMORY, + PARTITION `PartG` VALUES IN (22) ENGINE = MEMORY) ALTER TABLE TableA DROP PARTITION partE, PartG; ALTER TABLE TableA DROP PARTITION Partf; ALTER TABLE TableA ADD PARTITION @@ -825,12 +825,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = MEMORY, - PARTITION partB VALUES IN (2,10,11) ENGINE = MEMORY, - PARTITION Partc VALUES IN (3,4,7) ENGINE = MEMORY, - PARTITION PartD VALUES IN (5,6,12) ENGINE = MEMORY, - PARTITION PartE VALUES IN (13) ENGINE = MEMORY) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = MEMORY, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = MEMORY, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = MEMORY, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MEMORY, + PARTITION `PartE` VALUES IN (13) ENGINE = MEMORY) # Test of REORGANIZE PARTITIONS ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO (PARTITION Partc VALUES IN (1,7) @@ -863,12 +863,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MEMORY, - PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MEMORY, - PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MEMORY, - PARTITION PartD VALUES IN (5,6,12) ENGINE = MEMORY, - PARTITION PartE VALUES IN (13) ENGINE = MEMORY) + PARTITION BY LIST (`a`) +(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MEMORY, + PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MEMORY, + PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MEMORY, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MEMORY, + PARTITION `PartE` VALUES IN (13) ENGINE = MEMORY) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -928,12 +928,12 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MEMORY, - PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MEMORY, - PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MEMORY, - PARTITION PartD VALUES IN (5,6,12) ENGINE = MEMORY, - PARTITION PartE VALUES IN (13) ENGINE = MEMORY) + PARTITION BY LIST (`a`) +(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MEMORY, + PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MEMORY, + PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MEMORY, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MEMORY, + PARTITION `PartE` VALUES IN (13) ENGINE = MEMORY) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -971,10 +971,10 @@ t1 CREATE TABLE `t1` ( `b` varchar(255) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MEMORY AUTO_INCREMENT=2002 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION LT1000 VALUES LESS THAN (1000) ENGINE = MEMORY, - PARTITION LT2000 VALUES LESS THAN (2000) ENGINE = MEMORY, - PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = MEMORY) + PARTITION BY RANGE (`a`) +(PARTITION `LT1000` VALUES LESS THAN (1000) ENGINE = MEMORY, + PARTITION `LT2000` VALUES LESS THAN (2000) ENGINE = MEMORY, + PARTITION `MAX` VALUES LESS THAN MAXVALUE ENGINE = MEMORY) SELECT * FROM t1 ORDER BY a; a b 1 First diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result b/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result index e01f0e8d440..a498d4667b1 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result @@ -56,14 +56,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = MyISAM, - PARTITION partB ENGINE = MyISAM, - PARTITION Partc ENGINE = MyISAM, - PARTITION PartD ENGINE = MyISAM, - PARTITION partE ENGINE = MyISAM, - PARTITION Partf ENGINE = MyISAM, - PARTITION PartG ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = MyISAM, + PARTITION `partB` ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM, + PARTITION `PartD` ENGINE = MyISAM, + PARTITION `partE` ENGINE = MyISAM, + PARTITION `Partf` ENGINE = MyISAM, + PARTITION `PartG` ENGINE = MyISAM) ALTER TABLE TableA COALESCE PARTITION 4; SELECT * FROM TableA; a @@ -84,10 +84,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = MyISAM, - PARTITION partB ENGINE = MyISAM, - PARTITION Partc ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = MyISAM, + PARTITION `partB` ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM) # Test of EXCHANGE PARTITION WITH TABLE SELECT PARTITION_NAME, TABLE_ROWS FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA ='MySQL_Test_DB' AND TABLE_NAME = 'TableA'; PARTITION_NAME TABLE_ROWS @@ -112,10 +112,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = MyISAM, - PARTITION partB ENGINE = MyISAM, - PARTITION Partc ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = MyISAM, + PARTITION `partB` ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM) SELECT * FROM TableB; a 10 @@ -156,10 +156,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION parta ENGINE = MyISAM, - PARTITION partB ENGINE = MyISAM, - PARTITION Partc ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `parta` ENGINE = MyISAM, + PARTITION `partB` ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM) # Test of REORGANIZE PARTITIONS # Should not work on HASH/KEY ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO @@ -192,10 +192,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM, - PARTITION Partc ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MyISAM, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -264,10 +264,10 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY KEY (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM, - PARTITION Partc ENGINE = MyISAM) + PARTITION BY KEY (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MyISAM, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -355,14 +355,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = MyISAM, - PARTITION partB ENGINE = MyISAM, - PARTITION Partc ENGINE = MyISAM, - PARTITION PartD ENGINE = MyISAM, - PARTITION partE ENGINE = MyISAM, - PARTITION Partf ENGINE = MyISAM, - PARTITION PartG ENGINE = MyISAM) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = MyISAM, + PARTITION `partB` ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM, + PARTITION `PartD` ENGINE = MyISAM, + PARTITION `partE` ENGINE = MyISAM, + PARTITION `Partf` ENGINE = MyISAM, + PARTITION `PartG` ENGINE = MyISAM) ALTER TABLE TableA COALESCE PARTITION 4; SELECT * FROM TableA; a @@ -383,10 +383,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION parta ENGINE = MyISAM, - PARTITION partB ENGINE = MyISAM, - PARTITION Partc ENGINE = MyISAM) + PARTITION BY HASH (`a`) +(PARTITION `parta` ENGINE = MyISAM, + PARTITION `partB` ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM) # Test of REORGANIZE PARTITIONS # Should not work on HASH/KEY ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO @@ -419,10 +419,10 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM, - PARTITION Partc ENGINE = MyISAM) + PARTITION BY HASH (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MyISAM, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -491,10 +491,10 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) -(PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM, - PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM, - PARTITION Partc ENGINE = MyISAM) + PARTITION BY HASH (`a`) +(PARTITION `partB` COMMENT = 'Previusly named parta' ENGINE = MyISAM, + PARTITION `parta` COMMENT = 'Previusly named partB' ENGINE = MyISAM, + PARTITION `Partc` ENGINE = MyISAM) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -571,14 +571,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = MyISAM, - PARTITION partB VALUES LESS THAN (7) ENGINE = MyISAM, - PARTITION Partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION PartD VALUES LESS THAN (13) ENGINE = MyISAM, - PARTITION partE VALUES LESS THAN (16) ENGINE = MyISAM, - PARTITION Partf VALUES LESS THAN (19) ENGINE = MyISAM, - PARTITION PartG VALUES LESS THAN (22) ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MyISAM, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = MyISAM, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = MyISAM, + PARTITION `partE` VALUES LESS THAN (16) ENGINE = MyISAM, + PARTITION `Partf` VALUES LESS THAN (19) ENGINE = MyISAM, + PARTITION `PartG` VALUES LESS THAN (22) ENGINE = MyISAM) ALTER TABLE TableA DROP PARTITION partE, PartG; ALTER TABLE TableA DROP PARTITION Partf; ALTER TABLE TableA ADD PARTITION @@ -602,12 +602,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = MyISAM, - PARTITION partB VALUES LESS THAN (7) ENGINE = MyISAM, - PARTITION Partc VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION PartD VALUES LESS THAN (13) ENGINE = MyISAM, - PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MyISAM, + PARTITION `partB` VALUES LESS THAN (7) ENGINE = MyISAM, + PARTITION `Partc` VALUES LESS THAN (10) ENGINE = MyISAM, + PARTITION `PartD` VALUES LESS THAN (13) ENGINE = MyISAM, + PARTITION `PartE` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) # Test of REORGANIZE PARTITIONS # Error since it must reorganize a consecutive range ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO @@ -640,11 +640,11 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = MyISAM, - PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MyISAM, - PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MyISAM, - PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MyISAM, + PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MyISAM, + PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MyISAM, + PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MyISAM) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -713,11 +713,11 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION parta VALUES LESS THAN (4) ENGINE = MyISAM, - PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MyISAM, - PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MyISAM, - PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `parta` VALUES LESS THAN (4) ENGINE = MyISAM, + PARTITION `partD` VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = MyISAM, + PARTITION `partB` VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = MyISAM, + PARTITION `partC` VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = MyISAM) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -794,14 +794,14 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = MyISAM, - PARTITION partB VALUES IN (2,10,11) ENGINE = MyISAM, - PARTITION Partc VALUES IN (3,4,7) ENGINE = MyISAM, - PARTITION PartD VALUES IN (5,6,12) ENGINE = MyISAM, - PARTITION partE VALUES IN (16) ENGINE = MyISAM, - PARTITION Partf VALUES IN (19) ENGINE = MyISAM, - PARTITION PartG VALUES IN (22) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = MyISAM, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = MyISAM, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = MyISAM, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MyISAM, + PARTITION `partE` VALUES IN (16) ENGINE = MyISAM, + PARTITION `Partf` VALUES IN (19) ENGINE = MyISAM, + PARTITION `PartG` VALUES IN (22) ENGINE = MyISAM) ALTER TABLE TableA DROP PARTITION partE, PartG; ALTER TABLE TableA DROP PARTITION Partf; ALTER TABLE TableA ADD PARTITION @@ -825,12 +825,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION parta VALUES IN (1,8,9) ENGINE = MyISAM, - PARTITION partB VALUES IN (2,10,11) ENGINE = MyISAM, - PARTITION Partc VALUES IN (3,4,7) ENGINE = MyISAM, - PARTITION PartD VALUES IN (5,6,12) ENGINE = MyISAM, - PARTITION PartE VALUES IN (13) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `parta` VALUES IN (1,8,9) ENGINE = MyISAM, + PARTITION `partB` VALUES IN (2,10,11) ENGINE = MyISAM, + PARTITION `Partc` VALUES IN (3,4,7) ENGINE = MyISAM, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MyISAM, + PARTITION `PartE` VALUES IN (13) ENGINE = MyISAM) # Test of REORGANIZE PARTITIONS ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO (PARTITION Partc VALUES IN (1,7) @@ -863,12 +863,12 @@ Table Create Table TableA CREATE TABLE `TableA` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MyISAM, - PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MyISAM, - PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MyISAM, - PARTITION PartD VALUES IN (5,6,12) ENGINE = MyISAM, - PARTITION PartE VALUES IN (13) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MyISAM, + PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MyISAM, + PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MyISAM, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MyISAM, + PARTITION `PartE` VALUES IN (13) ENGINE = MyISAM) # Test of RENAME TABLE RENAME TABLE TableA to TableB; SELECT * FROM TableB; @@ -928,12 +928,12 @@ Table Create Table tablea CREATE TABLE `tablea` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 - PARTITION BY LIST (a) -(PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MyISAM, - PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MyISAM, - PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MyISAM, - PARTITION PartD VALUES IN (5,6,12) ENGINE = MyISAM, - PARTITION PartE VALUES IN (13) ENGINE = MyISAM) + PARTITION BY LIST (`a`) +(PARTITION `Partc` VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = MyISAM, + PARTITION `parta` VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = MyISAM, + PARTITION `partB` VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = MyISAM, + PARTITION `PartD` VALUES IN (5,6,12) ENGINE = MyISAM, + PARTITION `PartE` VALUES IN (13) ENGINE = MyISAM) # Test of REMOVE PARTITIONING ALTER TABLE TableA REMOVE PARTITIONING; SELECT * FROM TableA; @@ -971,10 +971,10 @@ t1 CREATE TABLE `t1` ( `b` varchar(255) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM AUTO_INCREMENT=2002 DEFAULT CHARSET=latin1 - PARTITION BY RANGE (a) -(PARTITION LT1000 VALUES LESS THAN (1000) ENGINE = MyISAM, - PARTITION LT2000 VALUES LESS THAN (2000) ENGINE = MyISAM, - PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = MyISAM) + PARTITION BY RANGE (`a`) +(PARTITION `LT1000` VALUES LESS THAN (1000) ENGINE = MyISAM, + PARTITION `LT2000` VALUES LESS THAN (2000) ENGINE = MyISAM, + PARTITION `MAX` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) SELECT * FROM t1 ORDER BY a; a b 1 First diff --git a/mysql-test/suite/parts/t/longname.test b/mysql-test/suite/parts/t/longname.test new file mode 100644 index 00000000000..0f7378ef8e3 --- /dev/null +++ b/mysql-test/suite/parts/t/longname.test @@ -0,0 +1,32 @@ +source include/have_innodb.inc; +source include/have_partition.inc; +set names utf8; + +create database mysqltest1; +select database_name, table_name, length(table_name) from mysql.innodb_table_stats where database_name = 'mysqltest1'; +CREATE TABLE mysqltest1.test_jfg_table_name_with_64_chars_123456789012345678901234567890 ( + id int(10) unsigned NOT NULL, + id2 int(10) unsigned NOT NULL, + PRIMARY KEY ( id, id2 ) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC +PARTITION BY RANGE ( id ) + SUBPARTITION BY HASH ( id2 ) + SUBPARTITIONS 2 ( + PARTITION test_jfg_partition_name_with_60_chars_1234567890123456789012 VALUES LESS THAN (1000) ENGINE = InnoDB, + PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB); + +select database_name, table_name, length(table_name) from mysql.innodb_table_stats where database_name = 'mysqltest1'; + +--error ER_PATH_LENGTH +CREATE TABLE mysqltest1.éééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé ( + id int(10) unsigned NOT NULL, + id2 int(10) unsigned NOT NULL, + PRIMARY KEY ( id, id2 ) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC +PARTITION BY RANGE ( id ) + SUBPARTITION BY HASH ( id2 ) + SUBPARTITIONS 2 ( + PARTITION çççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç VALUES LESS THAN (1000) ENGINE = InnoDB, + PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB); + +drop database mysqltest1; diff --git a/mysql-test/suite/rpl/r/circular_serverid0.result b/mysql-test/suite/rpl/r/circular_serverid0.result new file mode 100644 index 00000000000..112f9359ac4 --- /dev/null +++ b/mysql-test/suite/rpl/r/circular_serverid0.result @@ -0,0 +1,42 @@ +include/rpl_init.inc [topology=1->2->1] +include/rpl_connect.inc [creating M4] +include/rpl_connect.inc [creating M2] +SET @old_debug= @@global.debug; +connection M2; +STOP SLAVE; +SET GLOBAL debug_dbug= "+d,dbug.rows_events_to_delay_relay_logging"; +START SLAVE IO_THREAD; +include/wait_for_slave_io_to_start.inc +connection M2; +CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(30000)) ENGINE=innodb; +connection M4; +connection M4; +INSERT INTO `t1` VALUES (null, repeat('a', 1024)), (null, repeat('b', 1024)); +connection M2; +SET debug_sync='now WAIT_FOR start_sql_thread'; +START SLAVE SQL_THREAD; +include/show_binlog_events.inc +Log_name Pos Event_type Server_id End_log_pos Info +slave-bin.000001 # Gtid # # GTID #-#-# +slave-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(30000)) ENGINE=innodb +SET debug_sync='now SIGNAL go_on_relay_logging'; +connection M4; +connection M4; +connection M2; +connection M2; +include/show_binlog_events.inc +Log_name Pos Event_type Server_id End_log_pos Info +slave-bin.000001 # Gtid # # GTID #-#-# +slave-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(30000)) ENGINE=innodb +slave-bin.000001 # Gtid # # BEGIN GTID #-#-# +slave-bin.000001 # Annotate_rows # # INSERT INTO `t1` VALUES (null, repeat('a', 1024)), (null, repeat('b', 1024)) +slave-bin.000001 # Table_map # # table_id: # (test.t1) +slave-bin.000001 # Write_rows_v1 # # table_id: # +slave-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F +slave-bin.000001 # Xid # # COMMIT /* XID */ +connection M4; +drop table t1; +connection M2; +SET GLOBAL debug_dbug= @old_debug; +SET debug_sync='RESET'; +include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/circular_serverid0.cnf b/mysql-test/suite/rpl/t/circular_serverid0.cnf new file mode 100644 index 00000000000..277aac2869b --- /dev/null +++ b/mysql-test/suite/rpl/t/circular_serverid0.cnf @@ -0,0 +1,30 @@ +!include ../my.cnf + +[mysqld.1] +gtid-domain-id=4 +server-id=4 +# +log-slave-updates +slave-parallel-threads=0 +gtid-strict-mode=1 +gtid-ignore-duplicates=1 + +# +# Max-size row events to minimum with the idea to create +# a number of Rows_log_event per Query. +# +binlog-row-event-max-size=1024 + +[mysqld.2] +gtid-domain-id=2 +server-id=2 +# +log-slave-updates +slave-parallel-threads=0 +gtid-strict-mode=1 +gtid-ignore-duplicates=1 +binlog-row-event-max-size=1024 +# The slave will be initialized with a @@global.dbug-var value +skip-slave-start=1 + + diff --git a/mysql-test/suite/rpl/t/circular_serverid0.test b/mysql-test/suite/rpl/t/circular_serverid0.test new file mode 100644 index 00000000000..20ad58e2c52 --- /dev/null +++ b/mysql-test/suite/rpl/t/circular_serverid0.test @@ -0,0 +1,104 @@ +# +# Testing chain/circular replication scenario of MDEV-9670 +# The effect of the bug was that we got a commit with a GTID with server_id +# + +--source include/have_binlog_format_row.inc +--source include/have_innodb.inc +--source include/have_debug.inc +--source include/have_debug_sync.inc + +--let $rpl_topology= 1->2->1 +--source include/rpl_init.inc + +--let $rpl_connection_name= M4 +--let $rpl_server_number= 1 +--source include/rpl_connect.inc + +--let $rpl_connection_name= M2 +--let $rpl_server_number= 2 +--source include/rpl_connect.inc + +# The parameter reflects binlog-row-event-max-size @cnf. +--let $row_size=1024 + +SET @old_debug= @@global.debug; + +--connection M2 +STOP SLAVE; +SET GLOBAL debug_dbug= "+d,dbug.rows_events_to_delay_relay_logging"; +START SLAVE IO_THREAD; +--source include/wait_for_slave_io_to_start.inc + +--connection M2 +# This query also creates a Gtid event group whose Gtid will remain in +# ignored status for too long causing a following group split. + +CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(30000)) ENGINE=innodb; +--sync_slave_with_master M4 + +# This INSERT will be logged as two Write_log events which the buggy +# slave applier would split. + +--connection M4 +eval INSERT INTO `t1` VALUES (null, repeat('a', $row_size)), (null, repeat('b', $row_size)); + +# START M2 IO thread and wait for its signal to follow with the SQL +# thread start. At this moment the SQL thread shall be having 2 and +# "half" groups to execute. The "hafl" one would be committed by the +# buggy applier after which the IO is released to queue the rest of +# the 3rd group which the SQL thread commits separately to complete +# the split. + +--connection M2 + +# wait for IO signal to start the SQL thread. IO will be hanging upon that. +SET debug_sync='now WAIT_FOR start_sql_thread'; + +# Now the slave server has relay log whose last group is incomplete. +# An unfixed slave server would go to "insert" a "fake" +# Gtid_list_log_event event which actually would commit the incomplete +# group. However before to actual commit do_apply_event() hits some assert. +# In the fixed server the fake Gtid_list_log_event is *not* inserted +# in the middle of a group. +START SLAVE SQL_THREAD; + +# Sleep for a little time to give SQL thread a chance to commit while +# the IO thread is hanging (see +# DBUG_EXECUTE_IF("dbug.rows_events_to_delay_relay_logging"...) in +# queue_event). Alternatively to reproduce the case when buggy slave +# wait for the 1st group commit + +#--let $count= 1 +#--let $table= t1 +#--source include/wait_until_rows_count.inc + +--sleep 2 + +# Demonstrate either no split group in the correct slave or the 1nd +# group in the buggy one +--source include/show_binlog_events.inc + +# Release the IO thread +SET debug_sync='now SIGNAL go_on_relay_logging'; + +# Sync servers +--sync_slave_with_master M4 +--connection M4 +--sync_slave_with_master M2 +--connection M2 + +# Demonstrate replication goes correctly not to create any split, or +# the 2nd group in the buggy slave +--source include/show_binlog_events.inc + +# +# Cleanup +# +--connection M4 +drop table t1; + +--connection M2 +SET GLOBAL debug_dbug= @old_debug; +SET debug_sync='RESET'; +--source include/rpl_end.inc diff --git a/mysql-test/suite/storage_engine/parts/truncate_table.result b/mysql-test/suite/storage_engine/parts/truncate_table.result index fc409b805e2..bfbca529200 100644 --- a/mysql-test/suite/storage_engine/parts/truncate_table.result +++ b/mysql-test/suite/storage_engine/parts/truncate_table.result @@ -14,7 +14,7 @@ t1 CREATE TABLE `t1` ( `c` char(8) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 2 INSERT INTO t1 (c) VALUES ('a'),('b'),('c'); SHOW CREATE TABLE t1; @@ -24,7 +24,7 @@ t1 CREATE TABLE `t1` ( `c` char(8) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=<STORAGE_ENGINE> AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 2 TRUNCATE TABLE t1; SHOW CREATE TABLE t1; @@ -34,7 +34,7 @@ t1 CREATE TABLE `t1` ( `c` char(8) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 2 INSERT INTO t1 (c) VALUES ('d'); SHOW CREATE TABLE t1; @@ -44,7 +44,7 @@ t1 CREATE TABLE `t1` ( `c` char(8) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=<STORAGE_ENGINE> AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 - PARTITION BY HASH (a) + PARTITION BY HASH (`a`) PARTITIONS 2 SELECT a,c FROM t1; a c diff --git a/mysql-test/t/analyze_format_json.test b/mysql-test/t/analyze_format_json.test index 88a907718d9..915e0c2bf3c 100644 --- a/mysql-test/t/analyze_format_json.test +++ b/mysql-test/t/analyze_format_json.test @@ -212,3 +212,15 @@ GROUP BY sq ORDER BY gc; drop table t1,t2,t3; + +--echo # +--echo # MDEV-13286: Floating point exception in Filesort_tracker::print_json_members(Json_writer*) +--echo # +create table t0(a int); +insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); +create table t1 (a int, b int, c int); +insert into t1 select a,a,a from t0; +create table t2 as select * from t1; +--source include/analyze-format.inc +analyze format=json select a, (select t2.b from t2 where t2.a<t1.a order by t2.c limit 1) from t1 where t1.a<0; +drop table t0,t1,t2; diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 59694635c70..4d4a3f2d933 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -3606,7 +3606,7 @@ SET SESSION sql_mode=@old_sql_mode; drop table t2, t1; drop view v1; ---echo End of 5.0 tests. +--echo # End of 5.0 tests. # # Test [NOT] IN truth table (both as top-level and general predicate). @@ -4691,7 +4691,7 @@ select * from t2 where a=(select a from t1) and a='x'; drop table t1,t2; ---echo End of 5.1 tests +--echo # End of 5.1 tests --echo # --echo # Bug #11765713 58705: @@ -5163,7 +5163,7 @@ eval SELECT * FROM ( $subq ) AS alias3; DROP TABLE t1,t2; ---echo End of 5.2 tests +--echo # End of 5.2 tests --echo # --echo # BUG#779885: Crash in eliminate_item_equal with materialization=on in @@ -6012,11 +6012,17 @@ INSERT INTO t2 VALUES (3); CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2; +--error ER_WRONG_GROUP_FIELD +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +--error ER_WRONG_GROUP_FIELD SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; SELECT * FROM v2 where ( SELECT MIN(v2.f2) FROM t1 ) > 0; SELECT count(*) FROM v2 group by ( SELECT MIN(v2.f2) FROM t1 ); delete from t1; +--error ER_WRONG_GROUP_FIELD +SELECT ( SELECT MIN(t2.f2) FROM t1 ) AS sq FROM t2 GROUP BY sq; +--error ER_WRONG_GROUP_FIELD SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; drop view v2; @@ -6032,6 +6038,32 @@ SELECT * FROM t1 WHERE f2 >= SOME ( SELECT f1 FROM t1 ); SELECT * FROM t1 WHERE f2 <= SOME ( SELECT f1 FROM t1 ); DROP TABLE t1; +--echo # +--echo # MDEV-10146: Wrong result (or questionable result and behavior) +--echo # with aggregate function in uncorrelated SELECT subquery +--echo # +CREATE TABLE t1 (f1 INT); +CREATE VIEW v1 AS SELECT * FROM t1; +INSERT INTO t1 VALUES (1),(2); + +CREATE TABLE t2 (f2 int); + +INSERT INTO t2 VALUES (3); +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; + +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; + +INSERT INTO t2 VALUES (4); + +--error ER_SUBQUERY_NO_1_ROW +SELECT ( SELECT MAX(f1) FROM t2 ) FROM v1; +--error ER_SUBQUERY_NO_1_ROW +SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1; + +drop view v1; +drop table t1,t2; + +--echo # End of 10.0 tests --echo # --echo # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops @@ -6059,7 +6091,7 @@ SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo'); DROP TABLE t1, t2; SET NAMES default; ---echo End of 10.1 tests +--echo # End of 10.1 tests --echo # --echo # MDEV-12564: IN TO EXISTS transformation for rows after @@ -6076,4 +6108,4 @@ SELECT * FROM t t1 RIGHT JOIN t t2 ON (t2.pk = t1.pk) DROP TABLE t; ---echo End of 10.2 tests +--echo # End of 10.2 tests diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests index 48ca6184c50..08a42d543e2 100644 --- a/mysql-test/unstable-tests +++ b/mysql-test/unstable-tests @@ -24,38 +24,57 @@ ############################################################################## +main.alter_table_online : Modified in 10.2.7 main.analyze_format_json : MDEV-11866 - Mismatch +main.analyze_stmt_slow_query_log : MDEV-12237 - Wrong result main.analyze_stmt_orderby : MDEV-11866 - Mismatch +main.bootstrap : Modified in 10.2.7 main.check_constraint : Modified in 10.2.6 -main.cte_nonrecursive : Modified in 10.2.6 +main.client_xml : Modified in 10.2.7 +main.cte_nonrecursive : Modified in 10.2.7 main.cte_recursive : Modified in 10.2.6 -main.default : MDEV-12738 - Valgrind; modified in 10.2.6 -main.derived_cond_pushdown : Modified in 10.2.6 +main.ctype_ucs : Modified in 10.2.7 +main.default : Modified in 10.2.6 +main.derived_cond_pushdown : Modified in 10.2.7 +main.derived_view : Modified in 10.2.7 main.drop-no_root : MDEV-12633 - Valgrind -main.events_2 : Modified in 10.2.6 +main.errors : Modified in 10.2.7 +main.events_2 : MDEV-13277 - Crash; modified in 10.2.6 +main.func_concat : Modified in 10.2.7 +main.func_crypt : Modified in 10.2.7 +main.func_group : Modified in 10.2.7 main.func_json : MDEV-11648 - Valgrind; modified in 10.2.6 -main.gis : Modified in 10.2.6 +main.func_regexp_pcre : Modified in 10.2.7 +main.gis : Modified in 10.2.7 main.index_merge_innodb : MDEV-7142 - Plan mismatch +main.innodb_ext_key : Modified in 10.2.7 +main.innodb_mysql_lock : MDEV-7861 - Wrong result main.join_cache : Modified in 10.2.6 +main.join_outer : Modified in 10.2.7 main.keyread : Added in 10.2.6 +main.kill-2 : MDEV-13257 - Wrong result main.limit_rows_examined : Modified in 10.2.6 main.loaddata : Modified in 10.2.6 main.loadxml : Modified in 10.2.6 -main.log_tables-big : MDEV-12764 - Mismatch; modified in 10.2.6 -main.mix2_myisam : MDEV-11646 - Valgrind -main.mrr_icp_extra : MDEV-11646 - Valgrind -main.myisam : MDEV-11646 - Valgrind -main.myisampack : MDEV-11646 - Valgrind +main.log_slow : MDEV-13263 - Wrong result +main.log_tables-big : Modified in 10.2.6 +main.mdl : Added in 10.2.7 +main.mdl_sync : Modified in 10.2.7 +main.myisam_debug : Modified in 10.2.7 +main.mysql : Modified in 10.2.7 main.mysql_client_test : MDEV-12633 - Valgrind main.mysql_client_test_comp : MDEV-12633 - Valgrind main.mysql_client_test_nonblock : MDEV-12633 - Valgrind, CONC-208 - Error on Power main.mysqlcheck : MDEV-12633 - Valgrind +main.mysqld--help : Modified in 10.2.7 main.mysqld_option_err : MDEV-12747 - Timeout -main.mysqldump : Modified in 10.2.6 +main.mysqldump : MDEV-13191 - Assertion; modified in 10.2.6 main.mysqlhotcopy_myisam : MDEV-10995 - Hang on debug -main.mysqltest : Modified in 10.2.6 +main.mysqltest : Modified in 10.2.7 main.openssl_1 : Modified in 10.2.6 main.openssl_6975 : Modified in 10.2.6 +main.order_by : Modified in 10.2.7 +main.partition_alter : Modified in 10.2.7 main.partition_default : Modified in 10.2.6 main.plugin_loaderr : Modified in 10.2.6 main.query_cache_innodb : Added in 10.2.6 @@ -66,15 +85,22 @@ main.ssl_7937 : MDEV-11546 - Timeout on Windows; combinatio main.ssl_8k_key : Modified in 10.2.6 main.ssl_ca : MDEV-10895 - SSL connection error on Power main.ssl_timeout : MDEV-11244 - Crash -main.stat_tables_par : MDEV-10804 - Locking, mismatch -main.subselect : Modified in 10.2.6 +main.stat_tables_par : MDEV-13266 - Wrong result +main.status : MDEV-13255 - Wrong result +main.subselect : Modified in 10.2.7 main.subselect_exists2in : Modified in 10.2.6 -main.subselect_innodb : Modified in 10.2.6 -main.subselect_mat_cost_bugs : Modified in 10.2.6 -main.subselect_sj_mat : Modified in 10.2.6 +main.subselect_innodb : Modified in 10.2.7 +main.subselect_mat_cost_bugs : Modified in 10.2.7 +main.subselect_sj : Modified in 10.2.7 +main.subselect_sj_mat : Modified in 10.2.7 +main.subselect_sj2_mat : Modified in 10.2.7 main.symlink : Modified in 10.2.6 -main.view : Modified in 10.2.6 -main.win : Modified in 10.2.6 +main.trigger : Modified in 10.2.7 +main.type_json : Added in 10.2.7 +main.union : Modified in 10.2.7 +main.view : Modified in 10.2.7 +main.win : Modified in 10.2.7 +main.win_insert_select : Added in 10.2.7 #---------------------------------------------------------------- @@ -83,21 +109,30 @@ archive.mysqlhotcopy_archive : MDEV-10995 - Hang on debug #---------------------------------------------------------------- binlog.binlog_commit_wait : MDEV-10150 - Mismatch +binlog.binlog_parallel_replication_marks_row : Added in 10.2.7 +binlog.binlog_parallel_replication_marks_stm_mix : Added in 10.2.7 binlog.binlog_unsafe : MDEV-12436 - Data too long for column +binlog.flashback : MDEV-13264 - Wrong result; modified in 10.2.7 +binlog.mysqladmin : Added in 10.2.7 #---------------------------------------------------------------- +binlog_encryption.binlog_xa_recover : MDEV-12908 - Extra checkpoint binlog_encryption.rpl_binlog_errors : MDEV-12742 - Crash binlog_encryption.rpl_parallel : MDEV-10653 - Timeout in include binlog_encryption.rpl_semi_sync : MDEV-11673 - Valgrind -binlog.flashback : Modified in 10.2.6 +binlog_encryption.rpl_stm_relay_ign_space : MDEV-13278 - Wrong result (test assertion) #---------------------------------------------------------------- +connect.jdbc_new : Modified in 10.2.7 connect.secure_file_priv : Modified in 10.2.6 connect.tbl : MDEV-10179 - Mismatch, MDEV-9844 - Valgrind, crash connect.vcol : MDEV-12374 - Fails on Windows -connect.zip : MDEV-12631 - Valgrind + +#---------------------------------------------------------------- + +csv.read_only : Added in 10.2.7 #---------------------------------------------------------------- @@ -117,30 +152,35 @@ encryption.innodb-bad-key-change3 : Modified in 10.2.6 encryption.innodb-bad-key-change4 : Modified in 10.2.6 encryption.innodb-bad-key-change5 : Modified in 10.2.6 encryption.innodb-bad-key-shutdown : Modified in 10.2.6 -encryption.innodb-compressed-blob : Added in 10.2.6 +encryption.innodb-checksum-algorithm : Added in 10.2.7 +encryption.innodb-compressed-blob : Modified in 10.2.7 encryption.innodb-discard-import : Modified in 10.2.6 encryption.innodb-discard-import-change : MDEV-12632 - Valgrind; modified in 10.2.6 encryption.innodb-encryption-alter : Modified in 10.2.6 encryption.innodb-encryption-disable : Modified in 10.2.6 -encryption.innodb_encryption_discard_import : MDEV-11218 - Mismatch; modified in 10.2.6 +encryption.innodb_encryption_discard_import : MDEV-12903 - Wrong result; modified in 10.2.6 encryption.innodb_encryption_filekeys : MDEV-9962 - Timeout; modified in 10.2.6 encryption.innodb_encryption_is : Modified in 10.2.6 -encryption.innodb_encryption-page-compression : Modified in 10.2.6 +encryption.innodb_encrypt_log : MDEV-13253 - Wrong result +encryption.innodb_encrypt_log_corruption : MDEV-13253 - Wrong result +encryption.innodb_encryption-page-compression : Re-enabled in 10.2.7 encryption.innodb_encryption_row_compressed : Modified in 10.2.6 encryption.innodb_encryption_tables : MDEV-9359 - Assertion failure; modified in 10.2.6 encryption.innodb_first_page : Modified in 10.2.6 +encryption.innodb-first-page-read : Added in 10.2.7 encryption.innodb-force-corrupt : Added in 10.2.6 +encryption.innodb-key-rotation-disable : Modified in 10.2.7 encryption.innodb-log-encrypt : Added in 10.2.6 encryption.innodb-log-encrypt-crash : Added in 10.2.6 encryption.innodb_lotoftables : Modified in 10.2.6 encryption.innodb-missing-key : Modified in 10.2.6 -encryption.innodb_onlinealter_encryption : MDEV-10099 - Mismatch; modified in 10.2.6 +encryption.innodb_onlinealter_encryption : Modified in 10.2.6 encryption.innodb-page_encryption : Modified in 10.2.6 encryption.innodb-page_encryption-32k : Modified in 10.2.6 encryption.innodb-page_encryption_compression : Modified in 10.2.6 encryption.innodb_page_encryption_key_change : Modified in 10.2.6 encryption.innodb-page_encryption_log_encryption : Modified in 10.2.6 -encryption.innodb-redo-badkey : MDEV-12750 - InnoDB error, crash; added in 10.2.6 +encryption.innodb-redo-badkey : Added in 10.2.6 encryption.innodb-redo-nokeys : Added in 10.2.6 encryption.innodb_scrub : Modified in 10.2.6 encryption.innodb_scrub_background : Uses opt file modified in 10.2.6 @@ -152,6 +192,7 @@ engines/rr_trx.* : MDEV-10998 - Not maintained #---------------------------------------------------------------- +federated.assisted_discovery : Modified in 10.2.7 federated.federated_innodb : MDEV-10617 - Wrong checksum federated.federated_transactions : MDEV-10617 - Wrong checksum federated.federatedx : MDEV-10617 - Wrong checksum @@ -169,6 +210,7 @@ galera.GAL-480 : Added in 10.2.6 galera.galera_account_management : Modified in 10.2.6 galera.galera_admin : Added in 10.2.6 galera.galera_bf_abort : Modified in 10.2.6 +galera.galera_defaults : Modified in 10.2.7 galera.galera_desync_overlapped : Added in 10.2.6 galera.galera_gcache_recover : Added in 10.2.6 galera.galera_gcache_recover_full_gcache : Added in 10.2.6 @@ -192,6 +234,7 @@ galera.lp1376747-2 : Added in 10.2.6 galera.lp1376747-3 : Added in 10.2.6 galera.lp1376747-4 : Added in 10.2.6 galera.MW-258 : Modified in 10.2.6 +galera.MW-309 : Added in 10.2.7 galera.MW-313 : Added in 10.2.6 galera.MW-328A : Added in 10.2.6 galera.MW-328B : Added in 10.2.6 @@ -199,57 +242,76 @@ galera.MW-328C : Added in 10.2.6 galera.MW-328D : Added in 10.2.6 galera.MW-328E : Added in 10.2.6 galera.MW-329 : Added in 10.2.6 +galera.MW-369 : Added in 10.2.7 galera.pxc-421 : Added in 10.2.6 -galera_3nodes.* : MDEV-11490 - Warnings not suppressed - galera_3nodes.galera_safe_to_bootstrap : Added in 10.2.6 #---------------------------------------------------------------- gcol.gcol_column_def_options_innodb : Uses include modified in 10.2.6 -gcol.gcol_column_def_options_myisam : MDEV-11647 - Valgrind; uses include modified in 10.2.6 -gcol.innodb_virtual_basic : MDEV-11639 - Crash +gcol.gcol_column_def_options_myisam : Uses include modified in 10.2.6 gcol.innodb_virtual_debug : Modified in 10.2.6 gcol.innodb_virtual_fk : Modified in 10.2.6 #---------------------------------------------------------------- +innodb.101_compatibility : Perl file modified in 10.2.7 +innodb.alter_missing_tablespace : Modified in 10.2.7 innodb.alter_table : Modified in 10.2.6 innodb.autoinc_debug : Modified in 10.2.6 innodb.autoinc_persist : Modified in 10.2.6 -innodb.deadlock_detect : Modified in 10.2.6 +innodb.deadlock_detect : MDEV-13262 - Wrong error code; modified in 10.2.6 innodb.defrag_mdl-9155 : MDEV-11336 - Timeout +innodb.doublewrite : Modified in 10.2.7 +innodb.drop_table_background : Added in 10.2.7 innodb.foreign_key : Added in 10.2.6 +innodb.group_commit_binlog_pos : Modified in 10.2.7 +innodb.group_commit_binlog_pos_no_optimize_thread : Modified in 10.2.7 innodb.ibuf_not_empty : MDEV-12741 - Tablespace error; added in 10.2.6 innodb.innodb-32k-crash : Modified in 10.2.6 innodb.innodb-64k-crash : Modified in 10.2.6 -innodb.innodb-alter-debug : Added in 10.2.6 -innodb.innodb-alter-nullable : Added in 10.2.6 -innodb.innodb-alter-timestamp : Modified in 10.2.6 +innodb.innodb-alter-debug : Modified in 10.2.7 +innodb.innodb-alter-nullable : Modified in 10.2.7 +innodb.innodb-alter-table : Modified in 10.2.7 +innodb.innodb-alter-tempfile : Modified in 10.2.7 +innodb.innodb-alter-timestamp : Modified in 10.2.7 innodb.innodb-blob : Modified in 10.2.6 innodb.innodb_bug14147491 : MDEV-11808 - Index is corrupt; modified in 10.2.6 -innodb.innodb_defragment : MDEV-11336 - Mismatch; modified in 10.2.6 -innodb.innodb_defragment_small : MDEV-11336 - Mismatch; modified in 10.2.6 -innodb.innodb_defrag_binlog : MDEV-11336 - Mismatch +innodb.innodb_bug53290 : MDEV-12634 - Valgrind +innodb.innodb_defragment : MDEV-11336 - Mismatch; modified in 10.2.6 +innodb.innodb_defragment_small : MDEV-11336 - Mismatch; modified in 10.2.6 +innodb.innodb_defrag_binlog : MDEV-11336 - Mismatch innodb.innodb_defrag_concurrent : MDEV-11336 - Assertion failure, mismatch -innodb.innodb_defrag_stats : MDEV-11336 - Mismatch -innodb.innodb_force_recovery : Added in 10.2.6 +innodb.innodb_defrag_stats : MDEV-11336 - Mismatch +innodb.innodb_force_recovery : Modified in 10.2.7 +innodb.innodb-get-fk : MDEV-13276 - Server crash innodb.innodb_gis : Modified in 10.2.6 innodb.innodb-index-online-norebuild : Added in 10.2.6 innodb.innodb-isolation : Added in 10.2.6 -innodb.innodb_stats_del_mark : Added in 10.2.6 +innodb.innodb-page_compression_default : Modified in 10.2.7 +innodb.innodb-page_compression_snappy : Modified in 10.2.7 +innodb.innodb_stats_persistent : Added in 10.2.7 innodb.innodb_sys_semaphore_waits : MDEV-10331 - Semaphore wait innodb.innodb-virtual-columns2 : Added in 10.2.6 innodb.innodb-wl5522-debug : Modified in 10.2.6 innodb.insert_debug : Modified in 10.2.6 -innodb.log_file_name : Modified in 10.2.6 +innodb.log_corruption : MDEV-13251 - Wrong result +innodb.log_data_file_size : Modified in 10.2.7 +innodb.log_file : Modified in 10.2.7 +innodb.log_file_name : Modified in 10.2.7 +innodb.log_file_size : Modified in 10.2.7 innodb.readahead : Added in 10.2.6 innodb.redo_log_during_checkpoint : Added in 10.2.6 -innodb.truncate_debug : MDEV-12753 - Sync point timeout, MDEV-12754 - Semaphore wait; added in 10.2.6 -innodb.truncate_purge_debug : MDEV-12708 - Extra warning; added in 10.2.6 +innodb.row_format_redundant : Added in 10.2.7 +innodb.table_flags : Added in 10.2.7 +innodb.temporary_table : MDEV-13265 - Wrong result; modified in 10.2.7 +innodb.truncate_debug : MDEV-13256 - Timeout; added in 10.2.6 +innodb.truncate_purge_debug : Modified in 10.2.7 -innodb_fts.innodb_fts_plugin : MDEV-11649 - Valgrind +innodb_fts.fulltext_misc : MDEV-12636 - Valgrind +innodb_fts.innodb_fts_plugin : Modified in 10.2.7 +innodb_fts.innodb_fts_stopword_charset : MDEV-13259 - Table crashed innodb_gis.rtree : Modified in 10.2.6 @@ -257,9 +319,24 @@ innodb_undo.truncate : Added in 10.2.6 innodb_undo.truncate_multi_client : Added in 10.2.6 innodb_undo.truncate_recover : Added in 10.2.6 -innodb_zip.recover : MDEV-12794 - Table crashed; added in 10.2.6 -innodb_zip.wl6501_1 : MDEV-10891 - Can't create UNIX socket, MDEV-12748 - Unknown engine InnoDB -innodb_zip.wl5522_debug_zip : MDEV-11600 - Operating system error number 2 +innodb_zip.bug36169 : Modified in 10.2.7 +innodb_zip.bug36172 : Modified in 10.2.7 +innodb_zip.bug52745 : Modified in 10.2.7 +innodb_zip.bug53591 : Modified in 10.2.7 +innodb_zip.bug56680 : Modified in 10.2.7 +innodb_zip.cmp_drop_table : Modified in 10.2.7 +innodb_zip.create_options : Modified in 10.2.7 +innodb_zip.innochecksum : Modified in 10.2.7 +innodb_zip.innochecksum_2 : Modified in 10.2.7 +innodb_zip.innochecksum_3 : MDEV-13279 - Extra warnings; modified in 10.2.7 +innodb_zip.innodb-zip : Modified in 10.2.7 +innodb_zip.recover : Modified in 10.2.7 +innodb_zip.restart : Modified in 10.2.7 +innodb_zip.wl6501_1 : MDEV-10891 - Can't create UNIX socket +innodb_zip.wl5522_debug_zip : MDEV-11600 - Operating system error number 2; modified in 10.2.7 +innodb_zip.wl5522_zip : Modified in 10.2.7 +innodb_zip.wl6344_compress_level : Modified in 10.2.7 +innodb_zip.wl6501_scale_1 : MDEV-13254 - Timeout #---------------------------------------------------------------- @@ -267,16 +344,23 @@ json.json_no_table : MDEV-12732 - Valgrind #---------------------------------------------------------------- -large_tests.rpl_slave_net_timeout : MDEV-11002 - Mismatch - -#---------------------------------------------------------------- - maria.insert_select : MDEV-12757 - Timeout -maria.maria : MDEV-11646 - Valgrind #---------------------------------------------------------------- -mariabackup.* : MariaDB backup is not yet supported for 10.2 +mariabackup.* : suite.pm and .opt modified in 10.2.7 + +mariabackup.full_backup : Modified in 10.2.7 +mariabackup.incremental_backup : Modified in 10.2.7 +mariabackup.incremental_encrypted : Modified in 10.2.7 +mariabackup.partial : Modified in 10.2.7 +mariabackup.partial_exclude : Modified in 10.2.7 +mariabackup.small_ibd : Modified in 10.2.7 +mariabackup.xb_aws_key_management : Modified in 10.2.7 +mariabackup.xb_compressed_encrypted : Modified in 10.2.7 +mariabackup.xb_file_key_management : Modified in 10.2.7 +mariabackup.xb_partition : Modified in 10.2.7 +mariabackup.xbstream : Modified in 10.2.7 #---------------------------------------------------------------- @@ -285,17 +369,31 @@ mroonga/storage.index_multiple_column_unique_datetime_index_read : MDEV-8643 - V #---------------------------------------------------------------- multi_source.info_logs : MDEV-12629 - Valgrind +multi_source.mdev-9544 : Added in 10.2.7 +multi_source.reset_slave : MDEV-10690 - Wrong result +multi_source.simple : MDEV-4633 - Wrong result #---------------------------------------------------------------- +parts.longname : Added in 10.2.7 parts.partition_debug_innodb : MDEV-10891 - Can't create UNIX socket +parts.quoting : Added in 10.2.7 + +#---------------------------------------------------------------- + +percona.* : MDEV-10997 - Not maintained #---------------------------------------------------------------- +perfschema.bad_option_2 : Modified in 10.2.7 perfschema.bad_option_3 : MDEV-12728 - Timeout on Power perfschema.hostcache_ipv4_addrinfo_again_allow : MDEV-12759 - Crash perfschema.hostcache_ipv6_addrinfo_again_allow : MDEV-12752 - Crash +perfschema.hostcache_ipv6_addrinfo_bad_allow : MDEV-13260 - Crash +perfschema.hostcache_ipv6_ssl : MDEV-10696 - Crash +perfschema.setup_actors : MDEV-10679 - Crash perfschema.stage_mdl_procedure : MDEV-11545 - Missing row +perfschema.start_server_1_digest : Added in 10.2.7 #---------------------------------------------------------------- @@ -303,10 +401,7 @@ perfschema_stress.* : MDEV-10996 - Not maintained #---------------------------------------------------------------- -plugins.cracklib_password_check : MDEV-11650 - Valgrind plugins.feedback_plugin_send : MDEV-7932, MDEV-11118 - Connection problems and such -plugins.pam : MDEV-10940 - Valgrind -plugins.two_password_validations : MDEV-11650 - Valgrind #---------------------------------------------------------------- @@ -314,20 +409,33 @@ rocksdb.* : MyRocks is alpha-quality and tests are uns #---------------------------------------------------------------- +roles.current_role_view-12666 : Added in 10.2.7 +roles.show_create_database-10463 : Added in 10.2.7 + +#---------------------------------------------------------------- + +rpl.circular_serverid0 : Added in 10.2.7 rpl.rpl_binlog_errors : MDEV-12742 - Crash rpl.rpl_binlog_index : MDEV-9501 - Failed registering on master -rpl.rpl_domain_id_filter : MDEV-12250 - Failed to preallocate data rpl.rpl_domain_id_filter_io_crash : MDEV-12729 - Timeout in include file +rpl.rpl_domain_id_filter_restart : MDEV-10684 - Wrong result rpl.rpl_gtid_crash : MDEV-9501 - Failed registering on master +rpl.rpl_gtid_errorhandling : MDEV-13261 - Crash rpl.rpl_gtid_stop_start : MDEV-11621 - Table marked as crashed, MDEV-12731 - Valgrind -rpl.rpl_killed_ddl : MDEV-12756 - Can't find record rpl.rpl_mariadb_slave_capability : MDEV-11018 - Extra lines in binlog +rpl.rpl_mdev-11092 : MDEV-13065 - Wrong value in include; added in 10.2.7 rpl.rpl_parallel : MDEV-12730 - Assertion failure +rpl.rpl_parallel_mdev6589 : MDEV-12979 - Assertion failure +rpl.rpl_parallel_optimistic : Modified in 10.2.7 rpl.rpl_parallel_optimistic_nobinlog : MDEV-12746 - Timeouts, mismatch rpl.rpl_parallel_retry : MDEV-11119 - Crash rpl.rpl_temporal_mysql56_to_mariadb53 : MDEV-9501 - Failed registering on master rpl.rpl_semi_sync_uninstall_plugin : MDEV-10892 - Assertion failure +rpl.rpl_set_statement_default_master : MDEV-13258 - Extra warning +rpl.rpl_skip_replication : MDEV-13258 - Extra warning rpl.rpl_slave_grp_exec : MDEV-10514 - Deadlock +rpl.rpl_slow_query_log : MDEV-13250 - Test abort +rpl.rpl_sp_effects : MDEV-13249 - Crash rpl.rpl_stm_multi_query : MDEV-9501 - Failed registering on master rpl.rpl_upgrade_master_info : MDEV-11620 - Table marked as crashed @@ -346,32 +454,61 @@ sphinx.union-5539 : MDEV-10986 - Sporadic failures #---------------------------------------------------------------- +storage_engine.* : Not always timely maintained + +#---------------------------------------------------------------- + +sys_vars.delay_key_write_func : Modified in 10.2.7 sys_vars.innodb_deadlock_detect_basic : Added in 10.2.6 sys_vars.innodb_max_undo_log_size_basic : Modified in 10.2.6 +sys_vars.innodb_sched_priority_cleaner_basic : Modified in 10.2.7 sys_vars.innodb_support_xa_basic : Modified in 10.2.6 sys_vars.innodb_support_xa_func : Modified in 10.2.6 sys_vars.log_error_func : Modified in 10.2.6 sys_vars.rpl_init_slave_func : MDEV-10149 - Test assertion sys_vars.sysvars_wsrep : Modified in 10.2.6 +sys_vars.tmp_disk_table_size_basic : Added in 10.2.7 +sys_vars.tmp_disk_table_size_func : Added in 10.2.7 +sys_vars.tmp_memory_table_size_basic : Added in 10.2.7 #---------------------------------------------------------------- +tokudb.background_job_manager : Modified in 10.2.7 +tokudb.bug-1657908 : Added in 10.2.7 +tokudb.dir_cmd : Added in 10.2.7 +tokudb.hotindex-insert-bigchar : MDEV-12640 - Crash +tokudb.hotindex-update-1 : MDEV-12640 - Crash +tokudb.rows-32m-rand-insert : MDEV-12640 - Crash + tokudb_mariadb.mdev6657 : MDEV-12737 - Mismatch or valgrind -tokudb_backup.* : MDEV-11001 - Missing include file +tokudb_backup.* : MDEV-11001 - Missing include file; suite.pm modified in 10.2.7 tokudb_sys_vars.* : MDEV-11001 - Missing include file tokudb_rpl.* : MDEV-11001 - Missing include file +tokudb_backup.backup_master_info : Added in 10.2.7 +tokudb_backup.backup_master_state : Added in 10.2.7 +tokudb_backup.empty_slave_info_file : Added in 10.2.7 +tokudb_backup.innodb_use_native_aio_enabled : Added in 10.2.7 +tokudb_backup.rpl_safe_slave : Added in 10.2.7 +tokudb_backup.rpl_tokudb_commit_sync : Added in 10.2.7 + +tokudb_bugs.db233 : Modified in 10.2.7 +tokudb_bugs.leak172 : Modified in 10.2.7 +tokudb_bugs.xa-3 : MDEV-13267 - Assertion failure +tokudb_bugs.xa-4 : MDEV-13267 - Assertion failure + +#---------------------------------------------------------------- + +unit.conc_ps_bugs : MDEV-13252 - not ok 44 test_bug4236 + #---------------------------------------------------------------- -unit.conc_connection : CONC-252 - Connector tests fail -unit.conc_features-10_2 : CONC-252 - Connector tests fail -unit.conc_misc : CONC-252 - Connector tests fail -unit.conc_thread : CONC-252 - Connector tests fail +vcol.cross_db : Added in 10.2.7 +vcol.upgrade : Added in 10.2.7 #---------------------------------------------------------------- wsrep.binlog_format : Modified in 10.2.6 -wsrep_info.plugin : MDEV-12232 - Crash on Power -wsrep.pool_of_threads : MDEV-12234 - GLIBCXX_3.4.20 not found, MDEV-12758 - node not prepared +wsrep.pool_of_threads : MDEV-12234 - GLIBCXX_3.4.20 not found; modified in 10.2.7 wsrep.wsrep_rpl : Modified in 10.2.6 |