diff options
Diffstat (limited to 'mysql-test/suite/period')
-rw-r--r-- | mysql-test/suite/period/r/alter.result | 20 | ||||
-rw-r--r-- | mysql-test/suite/period/r/create.result | 6 | ||||
-rw-r--r-- | mysql-test/suite/period/r/overlaps.result | 12 |
3 files changed, 19 insertions, 19 deletions
diff --git a/mysql-test/suite/period/r/alter.result b/mysql-test/suite/period/r/alter.result index 8aa94cee59e..9eb4555c0bd 100644 --- a/mysql-test/suite/period/r/alter.result +++ b/mysql-test/suite/period/r/alter.result @@ -9,7 +9,7 @@ t CREATE TABLE `t` ( `s` date NOT NULL, `e` date NOT NULL, PERIOD FOR `a` (`s`, `e`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create or replace table t (s date, e date); alter table t change s s date, add period for a(s, e); show create table t; @@ -18,7 +18,7 @@ t CREATE TABLE `t` ( `s` date NOT NULL, `e` date NOT NULL, PERIOD FOR `a` (`s`, `e`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t add id int; show create table t; Table Create Table @@ -27,7 +27,7 @@ t CREATE TABLE `t` ( `e` date NOT NULL, `id` int(11) DEFAULT NULL, PERIOD FOR `a` (`s`, `e`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t drop id; show create table t; Table Create Table @@ -35,7 +35,7 @@ t CREATE TABLE `t` ( `s` date NOT NULL, `e` date NOT NULL, PERIOD FOR `a` (`s`, `e`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert t values(@e, @s); ERROR 23000: CONSTRAINT `a` failed for `test`.`t` alter table t drop constraint a; @@ -60,7 +60,7 @@ t CREATE TABLE `t` ( `s` date NOT NULL, `e` date NOT NULL, PERIOD FOR `a` (`s`, `e`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t drop period for a; # Constraint is dropped insert t values(@e, @s); @@ -83,7 +83,7 @@ t CREATE TABLE `t` ( `e` date NOT NULL, `s1` date NOT NULL, PERIOD FOR `b` (`s1`, `e`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert t(s, s1, e) values(@e, @s, @e); insert t(s, s1, e) values(@e, @e, @s); ERROR 23000: CONSTRAINT `b` failed for `test`.`t` @@ -95,7 +95,7 @@ t1 CREATE TABLE `t1` ( `e` date NOT NULL, `s1` date NOT NULL, PERIOD FOR `b` (`s1`, `e`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t2 (period for b(s,e)) select * from t; ERROR 23000: CONSTRAINT `b` failed for `test`.`t2` @@ -157,7 +157,7 @@ t CREATE TABLE `t` ( `s` date NOT NULL, `e` date NOT NULL, PERIOD FOR `mytime` (`s`, `e`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t add constraint mytime check (x > 1); show create table t; Table Create Table @@ -167,7 +167,7 @@ t CREATE TABLE `t` ( `e` date NOT NULL, PERIOD FOR `mytime` (`s`, `e`), CONSTRAINT `mytime` CHECK (`x` > 1) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert t values (2, @e, @s); ERROR 23000: CONSTRAINT `mytime_1` failed for `test`.`t` alter table t add constraint mytime_1 check (x > 2); @@ -219,6 +219,6 @@ t1 CREATE TABLE `t1` ( `x` date NOT NULL, `y` date NOT NULL, PERIOD FOR `mytime` (`x`, `y`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; # End of 10.5 tests diff --git a/mysql-test/suite/period/r/create.result b/mysql-test/suite/period/r/create.result index 69d7e918804..dcae15c0772 100644 --- a/mysql-test/suite/period/r/create.result +++ b/mysql-test/suite/period/r/create.result @@ -9,7 +9,7 @@ t CREATE TABLE `t` ( `e` date NOT NULL, PERIOD FOR `mytime` (`s`, `e`), PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create or replace table t (id int primary key, s timestamp(6), e timestamp(6), period for mytime(s,e)); show create table t; @@ -20,7 +20,7 @@ t CREATE TABLE `t` ( `e` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', PERIOD FOR `mytime` (`s`, `e`), PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # SQL16, Part 2, 11.3 <table definition>, Syntax Rules, 2)a) # 2) If a <table period definition> TPD is specified, then: # a) <table scope> shall not be specified. @@ -93,7 +93,7 @@ t CREATE TABLE `t` ( `e` date NOT NULL, PERIOD FOR `mytime` (`s`, `e`), CONSTRAINT `mytime` CHECK (`x` > 1) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert t values (2, '2001-01-01', '2001-01-01'); ERROR 23000: CONSTRAINT `mytime_1` failed for `test`.`t` show status like "Feature_application_time_periods"; diff --git a/mysql-test/suite/period/r/overlaps.result b/mysql-test/suite/period/r/overlaps.result index b8f23ce413c..3ed8e1a0014 100644 --- a/mysql-test/suite/period/r/overlaps.result +++ b/mysql-test/suite/period/r/overlaps.result @@ -10,7 +10,7 @@ t CREATE TABLE `t` ( `e` date NOT NULL, PERIOD FOR `p` (`s`, `e`), PRIMARY KEY (`id`,`p` WITHOUT OVERLAPS) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY KEY (`id`) insert into t values (1, '2003-01-01', '2003-03-01'), (1, '2003-05-01', '2003-07-01'); @@ -148,7 +148,7 @@ t CREATE TABLE `t` ( PERIOD FOR `p` (`s`, `e`), PRIMARY KEY (`id`,`p` WITHOUT OVERLAPS), UNIQUE KEY `u` (`u`) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t values (1, 1, '2003-03-01', '2003-05-01'); insert into t values (1, 2, '2003-05-01', '2003-07-01'); insert into t values (1, 3, '2003-04-01', '2003-05-01'); @@ -167,7 +167,7 @@ t CREATE TABLE `t` ( PERIOD FOR `p` (`s`, `e`), PRIMARY KEY (`id`,`p` WITHOUT OVERLAPS), UNIQUE KEY `u` (`u`,`p` WITHOUT OVERLAPS) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t values (2, NULL, '2003-03-01', '2003-05-01'); insert into t values (2, NULL, '2003-03-01', '2003-05-01'); ERROR 23000: Duplicate entry '2-2003-05-01-2003-03-01' for key 'PRIMARY' @@ -211,7 +211,7 @@ t CREATE TABLE `t` ( `y` int(11) DEFAULT NULL, PERIOD FOR `p` (`s`, `e`), PRIMARY KEY (`id`,`p` WITHOUT OVERLAPS) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING alter table t drop y; create or replace table t1 like t; show create table t1; @@ -222,7 +222,7 @@ t1 CREATE TABLE `t1` ( `e` date NOT NULL, PERIOD FOR `p` (`s`, `e`), PRIMARY KEY (`id`,`p` WITHOUT OVERLAPS) -) 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, s date, e date, period for p(s,e), primary key(x, p without overlaps)); @@ -313,7 +313,7 @@ t1 CREATE TABLE `t1` ( `e` date NOT NULL, PERIOD FOR `p` (`s`, `e`), UNIQUE KEY `f` (`f`,`p` WITHOUT OVERLAPS) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME LIMIT 1000 (PARTITION `p1` HISTORY ENGINE = InnoDB, PARTITION `p2` HISTORY ENGINE = InnoDB, |