diff options
Diffstat (limited to 'mysql-test/suite/versioning/r')
| -rw-r--r-- | mysql-test/suite/versioning/r/alter.result | 72 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/create.result | 62 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/data.result | 10 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/debug.result | 14 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/delete_history.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/online.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/optimized.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/partition,heap.rdiff | 26 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/partition.result | 216 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/rpl.result | 38 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/rpl_mix.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/rpl_row.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/rpl_stmt.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/trx_id.result | 2 |
14 files changed, 229 insertions, 231 deletions
diff --git a/mysql-test/suite/versioning/r/alter.result b/mysql-test/suite/versioning/r/alter.result index 0cdc5945acf..f92e530eacf 100644 --- a/mysql-test/suite/versioning/r/alter.result +++ b/mysql-test/suite/versioning/r/alter.result @@ -8,7 +8,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t drop system versioning; ERROR HY000: Table `t` is not system-versioned alter table t add system versioning; @@ -16,7 +16,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t add column y int; ERROR HY000: Not allowed for system-versioned `test`.`t`. Change @@system_versioning_alter_history to proceed with ALTER. alter table t add primary key (a); @@ -30,7 +30,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci set system_versioning_alter_history= keep; alter table t add system versioning; alter table t drop system versioning, drop column row_start; @@ -67,7 +67,7 @@ t CREATE TABLE `t` ( `trx_start` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, `trx_end` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`trx_start`, `trx_end`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t drop system versioning; ERROR HY000: Wrong parameters for `t`: missing 'DROP COLUMN `trx_start`' alter table t drop column trx_start, drop column trx_end; @@ -78,7 +78,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t add column trx_start timestamp(6) as row start; ERROR HY000: Table `t` is not system-versioned alter table t add system versioning; @@ -86,7 +86,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t add column trx_start timestamp(6) as row start; ERROR HY000: Duplicate ROW START column `trx_start` alter table t modify a int as row start; @@ -97,7 +97,7 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t add column c int; show create table t; Table Create Table @@ -105,7 +105,7 @@ t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t add column d int first; show create table t; Table Create Table @@ -114,7 +114,7 @@ t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t add column e int after d; show create table t; Table Create Table @@ -124,7 +124,7 @@ t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t drop column a; show create table t; Table Create Table @@ -133,7 +133,7 @@ t CREATE TABLE `t` ( `e` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t ( a int, row_start timestamp(6) as row start invisible, @@ -153,7 +153,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t drop column row_start; ERROR 42000: Can't DROP COLUMN `row_start`; check that it exists alter table t drop column row_end; @@ -178,7 +178,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING insert into t values(2); select * from t for system_time all; a @@ -210,7 +210,7 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from t; a b 3 NULL @@ -230,7 +230,7 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t modify a int with system versioning; ERROR HY000: Table `t` is not system-versioned alter table t modify a int without system versioning; @@ -242,14 +242,14 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING, `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t modify a int with system versioning; show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t( a int ) engine=innodb; @@ -265,14 +265,14 @@ t CREATE TABLE `t` ( `trx_start` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, `trx_end` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`trx_start`, `trx_end`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING # Issue #211: drop of system columns required before drop system versioning alter table t drop column trx_start, drop column trx_end; show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t drop system versioning; insert into t values(1); call verify_trt; @@ -292,7 +292,7 @@ t CREATE TABLE `t` ( `trx_start` bigint(20) unsigned GENERATED ALWAYS AS ROW START INVISIBLE, `trx_end` bigint(20) unsigned GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`trx_start`, `trx_end`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t drop column trx_start, drop column trx_end; call verify_trt; No A B C D @@ -306,7 +306,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING update t set a= 2; select * from t for system_time all; a @@ -318,7 +318,7 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from t; a b 2 NULL @@ -329,7 +329,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from t for system_time all; a 2 @@ -341,7 +341,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci call verify_trt; No A B C D create or replace table t (a int); @@ -411,7 +411,7 @@ t CREATE TABLE `t` ( `c` int(11) DEFAULT NULL, PRIMARY KEY (`b`), UNIQUE KEY `c` (`c`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t; a b c 1 2 3 @@ -462,7 +462,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `c` text DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t add fulltext key (c); create or replace table t (a int) with system versioning; alter table t drop column a; @@ -498,7 +498,7 @@ t CREATE TABLE `t` ( `row_start` timestamp(6) GENERATED ALWAYS AS ROW START, `row_end` timestamp(6) GENERATED ALWAYS AS ROW END, PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t drop column row_start, drop column row_end, @@ -508,7 +508,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t drop period for system_time; ERROR HY000: Table `t` is not system-versioned create or replace table t ( @@ -572,7 +572,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) GENERATED ALWAYS AS (0) STORED -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from t1; a b 1 0 @@ -588,7 +588,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from t1; a b 1 0 @@ -659,7 +659,7 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING, `b` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t change column a new_a int, drop system versioning; @@ -668,7 +668,7 @@ Table Create Table t CREATE TABLE `t` ( `new_a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t add system versioning; alter table t change column new_a a int without system versioning; show create table t; @@ -676,7 +676,7 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING, `b` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t add column c int, change column c c int without system versioning, @@ -716,7 +716,7 @@ t1 CREATE TABLE `t1` ( `row_end` timestamp(6) GENERATED ALWAYS AS ROW END, PRIMARY KEY (`b`,`row_end`), PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t1 drop column b; ERROR 42000: Key column 'b' doesn't exist in table create or replace table t1 ( @@ -734,7 +734,7 @@ t1 CREATE TABLE `t1` ( `row_end` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PRIMARY KEY (`b`,`row_end`), PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t1 drop column b; ERROR 42000: Key column 'b' doesn't exist in table drop table t1; @@ -802,6 +802,6 @@ t1 CREATE TABLE `t1` ( `x` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, `y` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`x`, `y`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING drop table t1; # End of 10.5 tests diff --git a/mysql-test/suite/versioning/r/create.result b/mysql-test/suite/versioning/r/create.result index caed619cbf5..5e68d4df2e8 100644 --- a/mysql-test/suite/versioning/r/create.result +++ b/mysql-test/suite/versioning/r/create.result @@ -12,7 +12,7 @@ t1 CREATE TABLE `t1` ( `Sys_start` SYS_DATATYPE GENERATED ALWAYS AS ROW START INVISIBLE COMMENT 'start', `Sys_end` SYS_DATATYPE GENERATED ALWAYS AS ROW END INVISIBLE COMMENT 'end', PERIOD FOR SYSTEM_TIME (`Sys_start`, `Sys_end`) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select table_catalog,table_schema,table_name,table_type,version,table_rows,data_free,auto_increment,check_time,table_collation,checksum,create_options,table_comment from information_schema.tables where table_name='t1'; table_catalog def table_schema test @@ -81,7 +81,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x2` int(10) unsigned DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 ( x3 int unsigned, Sys_start timestamp(6) as row start invisible, @@ -173,7 +173,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `x15` int(11) DEFAULT NULL, `B` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 ( x16 int with system versioning, B int @@ -183,7 +183,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `x16` int(11) DEFAULT NULL, `B` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 ( x17 int, B int without system versioning @@ -197,7 +197,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `x18` int(11) DEFAULT NULL, `B` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 ( x19 int with system versioning, B int without system versioning @@ -207,7 +207,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `x19` int(11) DEFAULT NULL, `B` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 ( x20 int with system versioning, B int without system versioning @@ -217,7 +217,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `x20` int(11) DEFAULT NULL, `B` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 ( x21 int without system versioning ); @@ -231,7 +231,7 @@ show create table tt1; Table Create Table tt1 CREATE TABLE `tt1` ( `a` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING drop table tt1; create temporary table tt1 like t1; Warnings: @@ -241,7 +241,7 @@ show create table tt1; Table Create Table tt1 CREATE TEMPORARY TABLE `tt1` ( `a` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # CREATE TABLE ... SELECT create or replace table t1 (x23 int) with system versioning; create or replace table t0( @@ -257,7 +257,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `x23` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ### 2. all visible fields are included create or replace table t3 as select * from t0; select * from t0; @@ -268,7 +268,7 @@ t3 CREATE TABLE `t3` ( `y` int(11) DEFAULT NULL, `st` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', `en` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000' -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ## For versioned table insert into t1 values (1); select row_start from t1 into @row_start; @@ -283,7 +283,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `x23` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING #### invisible fields are not copied select * from t2; x23 @@ -298,7 +298,7 @@ t3 CREATE TABLE `t3` ( `y` int(11) DEFAULT NULL, `st` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', `en` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000' -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from t3 where y > 2; y st en select y from t3 where st = @st and row_start > @st; @@ -317,7 +317,7 @@ t3 CREATE TABLE `t3` ( `st` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, `en` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`st`, `en`) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select y from t3; y 2 @@ -329,7 +329,7 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( `x23` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from t3; x23 1 @@ -355,7 +355,7 @@ Table Create Table t3 CREATE TABLE `t3` ( `x23` int(11) DEFAULT NULL, `y` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from t3 for system_time all; x23 y 1 3 @@ -387,7 +387,7 @@ t2 CREATE TABLE `t2` ( `x25` int(11) DEFAULT NULL, `row_start` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', `row_end` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000' -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create or replace table t2 with system versioning as select x25, row_start rs, row_end re from t1; show create table t2; @@ -396,7 +396,7 @@ t2 CREATE TABLE `t2` ( `x25` int(11) DEFAULT NULL, `rs` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', `re` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000' -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 ( x26 int, st bigint unsigned as row start, @@ -411,7 +411,7 @@ t2 CREATE TABLE `t2` ( `x26` int(11) DEFAULT NULL, `st` bigint(20) unsigned NOT NULL DEFAULT 0, `en` bigint(20) unsigned NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 (x27 int, id int) with system versioning engine NON_DEFAULT_ENGINE; create or replace table t2 (b int, id int); create or replace table t3 with system versioning @@ -423,7 +423,7 @@ t3 CREATE TABLE `t3` ( `x27` int(11) DEFAULT NULL, `rs` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', `re` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000' -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING ## Errors create or replace temporary table t (x28 int) with system versioning; ERROR HY000: System-versioned tables do not support CREATE TEMPORARY TABLE @@ -462,7 +462,7 @@ t3 CREATE TABLE `t3` ( `row_end` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', `st` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', `en` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000' -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create or replace table t3 ( y int, st timestamp(6) as row start invisible, @@ -480,7 +480,7 @@ t3 CREATE TABLE `t3` ( `st` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, `en` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`st`, `en`) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING # MDEV-14828 Server crashes in JOIN::prepare / setup_fields on 2nd execution of PS [#437] create or replace table t1 (x int) with system versioning; prepare bad from 'create or replace table t2 with system versioning as select * from t1'; @@ -499,13 +499,13 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(1) NOT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 (i int) with system versioning as select 1 as i; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 ( a int, row_start bigint as row start, @@ -554,12 +554,12 @@ Table Create Table t1 CREATE TABLE `t1` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING show create table t2; Table Create Table t2 CREATE TEMPORARY TABLE `t2` ( `id` int(11) NOT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop temporary table t2; create or replace table t1 ( a int, @@ -584,12 +584,12 @@ t1 CREATE TABLE `t1` ( KEY `row_end` (`row_end`), KEY `row_end_2` (`row_end`,`row_start`,`a`), PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING show create table t2; Table Create Table t2 CREATE TEMPORARY TABLE `t2` ( `a` int(11) NOT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop temporary table t2; drop table t1; # @@ -609,7 +609,7 @@ t1 CREATE TABLE `t1` ( `id` int(11) NOT NULL, `x` int(11) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING drop table t1; # # MDEV-26928 Column-inclusive WITH SYSTEM VERSIONING doesn't work with explicit system fields @@ -620,7 +620,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING, `y` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create or replace table t1 ( x int, y int with system versioning, row_start timestamp(6) as row start, @@ -634,7 +634,7 @@ t1 CREATE TABLE `t1` ( `row_start` timestamp(6) GENERATED ALWAYS AS ROW START, `row_end` timestamp(6) GENERATED ALWAYS AS ROW END, PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING drop table t1; # # MDEV-27452 TIMESTAMP(0) system field is allowed for certain creation of system-versioned table diff --git a/mysql-test/suite/versioning/r/data.result b/mysql-test/suite/versioning/r/data.result index 873f7297ad5..88ba4156afe 100644 --- a/mysql-test/suite/versioning/r/data.result +++ b/mysql-test/suite/versioning/r/data.result @@ -14,7 +14,7 @@ set timestamp=default; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (3); @@ -23,7 +23,7 @@ INSERT INTO `t1` VALUES /*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (1), @@ -31,14 +31,14 @@ INSERT INTO `t1` VALUES (3); #MYSQL_DUMP --compact --as-of="1990-08-02 00:00" --databases test -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */; +CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */; USE `test`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (1), @@ -49,7 +49,7 @@ INSERT INTO `t1` VALUES /*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (2), diff --git a/mysql-test/suite/versioning/r/debug.result b/mysql-test/suite/versioning/r/debug.result index f011bcf4057..6c160809870 100644 --- a/mysql-test/suite/versioning/r/debug.result +++ b/mysql-test/suite/versioning/r/debug.result @@ -3,7 +3,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create temporary table tt1 (a int) with system versioning; ERROR HY000: System-versioned tables do not support CREATE TEMPORARY TABLE set @old_dbug=@@global.debug_dbug; @@ -13,26 +13,26 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create temporary table tt2 (a int) with system versioning; show create table tt2; Table Create Table tt2 CREATE TEMPORARY TABLE `tt2` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci connect con1, localhost, root; create table t3 (a int); show create table t3; Table Create Table t3 CREATE TABLE `t3` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create temporary table tt3 (a int) with system versioning; show create table tt3; Table Create Table tt3 CREATE TEMPORARY TABLE `tt3` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci disconnect con1; connection default; set debug_dbug='+d,sysvers_show'; @@ -40,7 +40,7 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING create table t4 (a int); show create table t4; Table Create Table @@ -49,7 +49,7 @@ t4 CREATE TABLE `t4` ( `row_start` timestamp(6) GENERATED ALWAYS AS ROW START, `row_end` timestamp(6) GENERATED ALWAYS AS ROW END, PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING drop table t1, t2, t3, t4; set debug_dbug= @old_dbug; set global debug_dbug= @old_dbug; diff --git a/mysql-test/suite/versioning/r/delete_history.result b/mysql-test/suite/versioning/r/delete_history.result index 382b567a106..7d8d81472d1 100644 --- a/mysql-test/suite/versioning/r/delete_history.result +++ b/mysql-test/suite/versioning/r/delete_history.result @@ -213,7 +213,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 2 drop table t; diff --git a/mysql-test/suite/versioning/r/online.result b/mysql-test/suite/versioning/r/online.result index 62d62913428..b247ce49e18 100644 --- a/mysql-test/suite/versioning/r/online.result +++ b/mysql-test/suite/versioning/r/online.result @@ -107,7 +107,7 @@ t CREATE TABLE `t` ( `row_start` SYS_DATATYPE GENERATED ALWAYS AS ROW START INVISIBLE, `row_end` SYS_DATATYPE GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select count(*) from t for system_time all; count(*) 1 diff --git a/mysql-test/suite/versioning/r/optimized.result b/mysql-test/suite/versioning/r/optimized.result index 2385a43d0a4..b14d8a04876 100644 --- a/mysql-test/suite/versioning/r/optimized.result +++ b/mysql-test/suite/versioning/r/optimized.result @@ -71,5 +71,5 @@ Table Create Table t CREATE TABLE `t` ( `x` int(11) DEFAULT NULL, `y` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING -) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING drop table t; diff --git a/mysql-test/suite/versioning/r/partition,heap.rdiff b/mysql-test/suite/versioning/r/partition,heap.rdiff index 0844017d1f4..387a3cee754 100644 --- a/mysql-test/suite/versioning/r/partition,heap.rdiff +++ b/mysql-test/suite/versioning/r/partition,heap.rdiff @@ -1,6 +1,4 @@ ---- partition.result -+++ partition,heap.reject -@@ -2120,85 +2120,6 @@ +@@ -2132,85 +2132,6 @@ (PARTITION `p0` HISTORY ENGINE = X, PARTITION `pn` CURRENT ENGINE = X) drop tables t1, tp1; @@ -35,7 +33,7 @@ - `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, -- `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, +- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `u` int(11) DEFAULT NULL, - `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', - `i1` tinyint(4) DEFAULT NULL, @@ -53,14 +51,14 @@ - KEY `three` (`i1`,`i2`,`i3`), - PERIOD FOR SYSTEM_TIME (`s`, `e`), - CONSTRAINT `check_constr` CHECK (`u` > -1) --) ENGINE=X DEFAULT CHARSET=ucs2 WITH SYSTEM VERSIONING +-) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING -show create table t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, -- `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, +- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `u` int(11) DEFAULT NULL, - `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', - `i1` tinyint(4) DEFAULT NULL, @@ -78,7 +76,7 @@ - KEY `three` (`i1`,`i2`,`i3`), - PERIOD FOR SYSTEM_TIME (`s`, `e`), - CONSTRAINT `check_constr` CHECK (`u` > -1) --) ENGINE=X DEFAULT CHARSET=ucs2 WITH SYSTEM VERSIONING +-) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING - PARTITION BY RANGE (`x`) -(PARTITION `p0` VALUES LESS THAN (10) ENGINE = X, - PARTITION `pn` VALUES LESS THAN MAXVALUE ENGINE = X) @@ -86,7 +84,7 @@ # # End of 10.7 tests # -@@ -2753,134 +2674,6 @@ +@@ -2765,134 +2686,6 @@ Warning 4114 Versioned table `test`.`t1`: last HISTORY partition (`p0`) is out of INTERVAL, need more HISTORY partitions drop prepare s; affected rows: 0 @@ -121,7 +119,7 @@ - `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, -- `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, +- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `u` int(11) DEFAULT NULL, - `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', - `i1` tinyint(4) DEFAULT NULL, @@ -139,7 +137,7 @@ - KEY `three` (`i1`,`i2`,`i3`), - PERIOD FOR SYSTEM_TIME (`s`, `e`), - CONSTRAINT `check_constr` CHECK (`u` > -1) --) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=ucs2 WITH SYSTEM VERSIONING +-) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING - PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO -(PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, - PARTITION `pn` CURRENT ENGINE = DEFAULT_ENGINE) @@ -158,7 +156,7 @@ - `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, -- `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, +- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `u` int(11) DEFAULT NULL, - `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', - `i1` tinyint(4) DEFAULT NULL, @@ -176,7 +174,7 @@ - KEY `three` (`i1`,`i2`,`i3`), - PERIOD FOR SYSTEM_TIME (`s`, `e`), - CONSTRAINT `check_constr` CHECK (`u` > -1) --) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 WITH SYSTEM VERSIONING +-) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING - PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO -(PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, - PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, @@ -193,7 +191,7 @@ - `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, -- `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, +- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `u` int(11) DEFAULT NULL, - `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', - `i1` tinyint(4) DEFAULT NULL, @@ -211,7 +209,7 @@ - KEY `three` (`i1`,`i2`,`i3`), - PERIOD FOR SYSTEM_TIME (`s`, `e`), - CONSTRAINT `check_constr` CHECK (`u` > -1) --) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 WITH SYSTEM VERSIONING +-) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING - PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO -(PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, - PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result index 5ca28a26d35..34659b2923e 100644 --- a/mysql-test/suite/versioning/r/partition.result +++ b/mysql-test/suite/versioning/r/partition.result @@ -108,7 +108,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME (PARTITION `p0` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, @@ -132,7 +132,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME (PARTITION `custom_name` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `pn` CURRENT ENGINE = DEFAULT_ENGINE) @@ -251,7 +251,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 2 PARTITIONS 3 alter table t1 drop partition non_existent; @@ -457,7 +457,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 DAY STARTS TIMESTAMP'2000-01-01 00:00:00' PARTITIONS 2 # Test STARTS warning @@ -468,7 +468,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 DAY STARTS TIMESTAMP'2000-01-01 00:00:00' PARTITIONS 2 create or replace table t1 (i int) with system versioning @@ -483,7 +483,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 SECOND STARTS TIMESTAMP'1999-12-15 13:33:33' PARTITIONS 2 create or replace table t1 (i int) with system versioning @@ -492,7 +492,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 MINUTE STARTS TIMESTAMP'1999-12-15 13:33:00' PARTITIONS 2 create or replace table t1 (i int) with system versioning @@ -501,7 +501,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'1999-12-15 13:00:00' PARTITIONS 2 create or replace table t1 (i int) with system versioning @@ -510,7 +510,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 DAY STARTS TIMESTAMP'1999-12-15 00:00:00' PARTITIONS 2 create or replace table t1 (i int) with system versioning @@ -519,7 +519,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 MONTH STARTS TIMESTAMP'1999-12-15 00:00:00' PARTITIONS 2 create or replace table t1 (i int) with system versioning @@ -528,7 +528,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 YEAR STARTS TIMESTAMP'1999-12-15 00:00:00' PARTITIONS 2 # seconds equivalent of 1 day does not round: @@ -538,7 +538,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 86400 SECOND STARTS TIMESTAMP'1999-12-15 13:33:33' PARTITIONS 2 # STARTS value is in local time_zone: @@ -554,14 +554,14 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 DAY STARTS TIMESTAMP'2000-01-01 00:00:00' PARTITIONS 2 show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 DAY STARTS TIMESTAMP'2000-01-01 00:00:00' PARTITIONS 2 set time_zone="+00:00"; @@ -569,14 +569,14 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 DAY STARTS TIMESTAMP'1999-12-31 21:00:00' PARTITIONS 2 show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 DAY STARTS TIMESTAMP'1999-12-31 21:00:00' PARTITIONS 2 # Test rotation @@ -953,7 +953,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `pk` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 7 SECOND STARTS TIMESTAMP'2018-04-11 17:00:04' (PARTITION `ver_p1` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `ver_pn` CURRENT ENGINE = DEFAULT_ENGINE) @@ -1005,7 +1005,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME PARTITIONS 2 # 2 partitions are created: p0 and pn @@ -1018,7 +1018,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 10 PARTITIONS 4 # 4 partitions are created: p0, p1, p2 and pn @@ -1627,7 +1627,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME PARTITIONS 3 alter table t1 add partition partitions 2; @@ -1637,7 +1637,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME PARTITIONS 5 alter table t1 add partition partitions 3; @@ -1647,7 +1647,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME PARTITIONS 8 drop tables t1; @@ -1661,7 +1661,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 (PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p3` HISTORY ENGINE = DEFAULT_ENGINE, @@ -1671,7 +1671,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 (PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p3` HISTORY ENGINE = DEFAULT_ENGINE, @@ -1691,7 +1691,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 (PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p8` HISTORY ENGINE = DEFAULT_ENGINE, @@ -1704,7 +1704,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 (PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p8` HISTORY ENGINE = DEFAULT_ENGINE, @@ -1731,7 +1731,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `f` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME PARTITIONS 2 create or replace table t1 (f int) with system versioning @@ -1741,7 +1741,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `f` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY HASH (`f`) create or replace table t1 (x int) with system versioning; alter table t1 partition by system_time; @@ -1749,7 +1749,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME PARTITIONS 2 create or replace table t1 (x int) with system versioning @@ -1758,7 +1758,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 100 PARTITIONS 4 alter table t1 add partition partitions 2; @@ -1767,7 +1767,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME PARTITIONS 6 alter table t1 partition by system_time limit 33; @@ -1775,7 +1775,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 33 PARTITIONS 6 set timestamp= unix_timestamp('2000-01-01 00:00:00'); @@ -1794,7 +1794,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' PARTITIONS 6 select * from t1 partition (p0); @@ -1816,7 +1816,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 PARTITIONS 6 update t1 set x= x + 1; @@ -1864,7 +1864,7 @@ show create table tp2; Table Create Table tp2 CREATE TABLE `tp2` ( `x` int(11) DEFAULT NULL -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from tp2; x 13 @@ -1876,7 +1876,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY RANGE (`x`) (PARTITION `p1` VALUES LESS THAN (10) ENGINE = X, PARTITION `p3` VALUES LESS THAN (30) ENGINE = X, @@ -1910,7 +1910,7 @@ show create table tp3; Table Create Table tp3 CREATE TABLE `tp3` ( `x` int(11) DEFAULT NULL -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from tp3; x 23 @@ -1918,7 +1918,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY RANGE (`x`) (PARTITION `p1` VALUES LESS THAN (10) ENGINE = X, PARTITION `p4` VALUES LESS THAN (40) ENGINE = X, @@ -1947,7 +1947,7 @@ show create table tp4; Table Create Table tp4 CREATE TABLE `tp4` ( `x` int(11) DEFAULT NULL -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from tp4; x 33 @@ -1955,7 +1955,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY RANGE (`x`) (PARTITION `p1` VALUES LESS THAN (10) ENGINE = X, PARTITION `p5` VALUES LESS THAN (50) ENGINE = X, @@ -2003,7 +2003,7 @@ tp1 CREATE TABLE `tp1` ( `row_start` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, `row_end` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from tp1; x select * from tp1 for system_time all; @@ -2016,7 +2016,7 @@ t1 CREATE TABLE `t1` ( `row_start` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, `row_end` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 (PARTITION `p0` HISTORY ENGINE = X, PARTITION `p2` HISTORY ENGINE = X, @@ -2072,7 +2072,7 @@ tp0 CREATE TABLE `tp0` ( `row_start` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, `row_end` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING show create table tp1; Table Create Table tp1 CREATE TABLE `tp1` ( @@ -2080,7 +2080,7 @@ tp1 CREATE TABLE `tp1` ( `row_start` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, `row_end` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING select * from tp0; x select * from tp1; @@ -2098,7 +2098,7 @@ t1 CREATE TABLE `t1` ( `row_start` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, `row_end` timestamp(6) GENERATED ALWAYS AS ROW END INVISIBLE, PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 02:00:00' (PARTITION `p2` HISTORY ENGINE = X, PARTITION `pn` CURRENT ENGINE = X) @@ -2122,12 +2122,12 @@ show create table tp1; Table Create Table tp1 CREATE TABLE `tp1` ( `x` int(11) DEFAULT NULL -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=X DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 (PARTITION `p0` HISTORY ENGINE = X, PARTITION `pn` CURRENT ENGINE = X) @@ -2163,7 +2163,7 @@ tp1 CREATE TABLE `tp1` ( `x` int(11) NOT NULL AUTO_INCREMENT, `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, + `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `u` int(11) DEFAULT NULL, `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', `i1` tinyint(4) DEFAULT NULL, @@ -2181,14 +2181,14 @@ tp1 CREATE TABLE `tp1` ( KEY `three` (`i1`,`i2`,`i3`), PERIOD FOR SYSTEM_TIME (`s`, `e`), CONSTRAINT `check_constr` CHECK (`u` > -1) -) ENGINE=X DEFAULT CHARSET=ucs2 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, + `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `u` int(11) DEFAULT NULL, `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', `i1` tinyint(4) DEFAULT NULL, @@ -2206,7 +2206,7 @@ t1 CREATE TABLE `t1` ( KEY `three` (`i1`,`i2`,`i3`), PERIOD FOR SYSTEM_TIME (`s`, `e`), CONSTRAINT `check_constr` CHECK (`u` > -1) -) ENGINE=X DEFAULT CHARSET=ucs2 WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING PARTITION BY RANGE (`x`) (PARTITION `p0` VALUES LESS THAN (10) ENGINE = X, PARTITION `pn` VALUES LESS THAN MAXVALUE ENGINE = X) @@ -2224,7 +2224,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 2 # Turn off AUTO @@ -2233,7 +2233,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 PARTITIONS 2 # Get AUTO back @@ -2242,7 +2242,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 2 insert into t1 values (1); @@ -2254,7 +2254,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 2 # Too many partitions error @@ -2342,7 +2342,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 3600 SECOND STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 affected rows: 1 @@ -2355,7 +2355,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 3600 SECOND STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 4 affected rows: 1 @@ -2368,7 +2368,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 3600 SECOND STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 5 affected rows: 1 @@ -2386,7 +2386,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO (PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p3` HISTORY ENGINE = DEFAULT_ENGINE, @@ -2401,7 +2401,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO (PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p3` HISTORY ENGINE = DEFAULT_ENGINE, @@ -2417,7 +2417,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO (PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p3` HISTORY ENGINE = DEFAULT_ENGINE, @@ -2436,7 +2436,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO (PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p3` HISTORY ENGINE = DEFAULT_ENGINE, @@ -2470,7 +2470,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 4 affected rows: 1 @@ -2480,7 +2480,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 4 affected rows: 1 @@ -2516,7 +2516,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 10 AUTO PARTITIONS 3 affected rows: 1 @@ -2541,7 +2541,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 affected rows: 1 @@ -2556,7 +2556,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 4 affected rows: 1 @@ -2587,7 +2587,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 affected rows: 1 @@ -2595,7 +2595,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `y` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 affected rows: 1 @@ -2608,7 +2608,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 4 affected rows: 1 @@ -2616,7 +2616,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `y` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 4 affected rows: 1 @@ -2629,7 +2629,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 5 affected rows: 1 @@ -2637,7 +2637,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `y` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS ok affected rows: 1 @@ -2660,7 +2660,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 affected rows: 1 @@ -2679,7 +2679,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 4 affected rows: 1 @@ -2697,7 +2697,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 5 affected rows: 1 @@ -2717,7 +2717,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 6 affected rows: 1 @@ -2733,7 +2733,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 7 affected rows: 1 @@ -2796,7 +2796,7 @@ t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, + `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `u` int(11) DEFAULT NULL, `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', `i1` tinyint(4) DEFAULT NULL, @@ -2814,7 +2814,7 @@ t1 CREATE TABLE `t1` ( KEY `three` (`i1`,`i2`,`i3`), PERIOD FOR SYSTEM_TIME (`s`, `e`), CONSTRAINT `check_constr` CHECK (`u` > -1) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=ucs2 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO (PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `pn` CURRENT ENGINE = DEFAULT_ENGINE) @@ -2833,7 +2833,7 @@ t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, + `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `u` int(11) DEFAULT NULL, `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', `i1` tinyint(4) DEFAULT NULL, @@ -2851,7 +2851,7 @@ t1 CREATE TABLE `t1` ( KEY `three` (`i1`,`i2`,`i3`), PERIOD FOR SYSTEM_TIME (`s`, `e`), CONSTRAINT `check_constr` CHECK (`u` > -1) -) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO (PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, @@ -2868,7 +2868,7 @@ t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, + `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `u` int(11) DEFAULT NULL, `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', `i1` tinyint(4) DEFAULT NULL, @@ -2886,7 +2886,7 @@ t1 CREATE TABLE `t1` ( KEY `three` (`i1`,`i2`,`i3`), PERIOD FOR SYSTEM_TIME (`s`, `e`), CONSTRAINT `check_constr` CHECK (`u` > -1) -) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO (PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, @@ -2905,7 +2905,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL, PRIMARY KEY (`x`) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 # LOAD DATA .. REPLACE @@ -2921,7 +2921,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL, PRIMARY KEY (`x`) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 # Concurrent DML @@ -2933,7 +2933,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 connect con8, localhost, root; @@ -2987,7 +2987,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 4 drop tables t1; @@ -3014,7 +3014,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 connection default; @@ -3023,7 +3023,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 set timestamp= unix_timestamp('2000-01-01 02:00:00'); @@ -3039,7 +3039,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 4 disconnect con1; @@ -3061,7 +3061,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 02:00:00' AUTO PARTITIONS 4 create procedure sp() update t set a= a + 1; @@ -3074,7 +3074,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 02:00:00' AUTO PARTITIONS 6 drop table t; @@ -3099,7 +3099,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 insert into t2 values (2); @@ -3107,7 +3107,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 4 set timestamp= unix_timestamp('2000-01-01 03:00:00'); @@ -3117,7 +3117,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 5 set timestamp= unix_timestamp('2000-01-01 04:00:00'); @@ -3127,7 +3127,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 6 set timestamp= unix_timestamp('2000-01-01 05:00:00'); @@ -3137,7 +3137,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 7 set timestamp= unix_timestamp('2000-01-01 06:00:00'); @@ -3147,7 +3147,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 8 set timestamp= unix_timestamp('2000-01-01 08:00:00'); @@ -3156,7 +3156,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 10 set timestamp= unix_timestamp('2000-01-01 09:00:00'); @@ -3165,7 +3165,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 11 set timestamp= unix_timestamp('2000-01-01 10:00:00'); @@ -3174,7 +3174,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 12 update t2 set x= x + 1; @@ -3184,7 +3184,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 13 update t3 set x= x + 1; @@ -3196,7 +3196,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 14 set timestamp= unix_timestamp('2000-01-01 13:00:00'); @@ -3206,7 +3206,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 15 set timestamp= unix_timestamp('2000-01-01 14:00:00'); @@ -3216,7 +3216,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 16 set timestamp= unix_timestamp('2000-01-01 15:00:00'); @@ -3226,7 +3226,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 17 unlock tables; @@ -3234,7 +3234,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 17 drop tables t1, t2, t3; diff --git a/mysql-test/suite/versioning/r/rpl.result b/mysql-test/suite/versioning/r/rpl.result index 9a6c403c096..3e0bc85cea7 100644 --- a/mysql-test/suite/versioning/r/rpl.result +++ b/mysql-test/suite/versioning/r/rpl.result @@ -128,7 +128,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING ## Case 2: ERROR on the master, it'll fail on the master, the slave won't see it connection master; set system_versioning_alter_history= ERROR; @@ -140,7 +140,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING ## Case 3: table is not versioned on the master, ALTER will work on the slave connection master; create or replace table t1 (a int); @@ -154,7 +154,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING connection master; drop table t1, t2; create table t1 (i int) with system versioning partition by system_time limit 8 ( partition p1 history, partition p2 history, partition pn current ); @@ -178,7 +178,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 connection slave; @@ -186,7 +186,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO PARTITIONS 3 connection master; @@ -208,7 +208,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 01:00:00' AUTO PARTITIONS 3 connection slave; @@ -216,7 +216,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 01:00:00' AUTO PARTITIONS 3 connection master; @@ -234,7 +234,7 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 02:00:00' AUTO PARTITIONS 3 connection slave; @@ -243,7 +243,7 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 02:00:00' AUTO PARTITIONS 3 connection master; @@ -262,7 +262,7 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 03:00:00' AUTO PARTITIONS 3 connection slave; @@ -271,7 +271,7 @@ Table Create Table t CREATE TABLE `t` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 03:00:00' AUTO PARTITIONS 3 connection master; @@ -288,7 +288,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 04:00:00' AUTO PARTITIONS 3 connection slave; @@ -296,7 +296,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 04:00:00' AUTO PARTITIONS 3 connection master; @@ -313,7 +313,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 05:00:00' AUTO PARTITIONS 3 connection slave; @@ -321,7 +321,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 05:00:00' AUTO PARTITIONS 3 connection master; @@ -340,7 +340,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 06:00:00' AUTO PARTITIONS 3 connection slave; @@ -348,7 +348,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 06:00:00' AUTO PARTITIONS 3 connection master; @@ -367,7 +367,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 07:00:00' AUTO PARTITIONS 3 connection slave; @@ -375,7 +375,7 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2001-01-01 07:00:00' AUTO PARTITIONS 3 connection master; diff --git a/mysql-test/suite/versioning/r/rpl_mix.result b/mysql-test/suite/versioning/r/rpl_mix.result index 56af76b8fc2..856678ae373 100644 --- a/mysql-test/suite/versioning/r/rpl_mix.result +++ b/mysql-test/suite/versioning/r/rpl_mix.result @@ -21,7 +21,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 3 select * from t1; @@ -55,7 +55,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 3 select * from t1; diff --git a/mysql-test/suite/versioning/r/rpl_row.result b/mysql-test/suite/versioning/r/rpl_row.result index ab96268f5a6..c161f68d0bd 100644 --- a/mysql-test/suite/versioning/r/rpl_row.result +++ b/mysql-test/suite/versioning/r/rpl_row.result @@ -29,7 +29,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL, `y` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING connection master; set timestamp= 12345; insert t1 values (1, 1); @@ -62,7 +62,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 3 select * from t1; @@ -96,7 +96,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 3 select * from t1; diff --git a/mysql-test/suite/versioning/r/rpl_stmt.result b/mysql-test/suite/versioning/r/rpl_stmt.result index 1a5087dfa74..97ce2265ac0 100644 --- a/mysql-test/suite/versioning/r/rpl_stmt.result +++ b/mysql-test/suite/versioning/r/rpl_stmt.result @@ -13,7 +13,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 3 select * from t1; @@ -39,7 +39,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1 AUTO PARTITIONS 3 select * from t1; diff --git a/mysql-test/suite/versioning/r/trx_id.result b/mysql-test/suite/versioning/r/trx_id.result index 6c337863790..9beec414fbb 100644 --- a/mysql-test/suite/versioning/r/trx_id.result +++ b/mysql-test/suite/versioning/r/trx_id.result @@ -520,7 +520,7 @@ t CREATE TABLE `t` ( `row_end` bigint(20) unsigned GENERATED ALWAYS AS ROW END INVISIBLE, PRIMARY KEY (`a`,`row_end`), PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING # handles VIRTUAL columns too CREATE OR REPLACE TABLE t ( a INT AS (b + 1), |