diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
| commit | 44fd2c4b24b35cdb5f573395fe07800d05b7c8b6 (patch) | |
| tree | 13c130d521c7c1dea3bc9b8b26d9057a1c268668 /mysql-test/suite/sql_sequence | |
| parent | 5d9d379329abcbb661ed6c027efbb9fd763958c6 (diff) | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| download | mariadb-git-44fd2c4b24b35cdb5f573395fe07800d05b7c8b6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/sql_sequence')
| -rw-r--r-- | mysql-test/suite/sql_sequence/create.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/default.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/mysqldump.result | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/suite/sql_sequence/create.result b/mysql-test/suite/sql_sequence/create.result index add23c1ad2d..9326d7016c9 100644 --- a/mysql-test/suite/sql_sequence/create.result +++ b/mysql-test/suite/sql_sequence/create.result @@ -587,7 +587,7 @@ s CREATE TABLE `s` ( `cache` bigint(21) NOT NULL, `cycle` tinyint(1) unsigned NOT NULL, `round` bigint(21) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show create table s2; Table Create Table s2 CREATE TABLE `s2` ( @@ -599,7 +599,7 @@ s2 CREATE TABLE `s2` ( `cache` bigint(21) NOT NULL, `cycle` tinyint(1) unsigned NOT NULL, `round` bigint(21) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show create sequence s; ERROR 42S02: 'test.s' is not a SEQUENCE show create sequence s2; @@ -615,7 +615,7 @@ show create table s; Table Create Table s CREATE TEMPORARY TABLE `s` ( `i` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table s; create or replace sequence s; create temporary sequence s; diff --git a/mysql-test/suite/sql_sequence/default.result b/mysql-test/suite/sql_sequence/default.result index 4969e832652..cc22fb42464 100644 --- a/mysql-test/suite/sql_sequence/default.result +++ b/mysql-test/suite/sql_sequence/default.result @@ -14,7 +14,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT nextval(`test`.`s1`), `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 SET b=1; insert into t1 SET b=2; insert into t1 (b) values (3),(4); @@ -95,7 +95,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT nextval(`test`.`s2`), `d` int(11) DEFAULT lastval(`test`.`s2`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t1; a b c d 1 5 1 1 @@ -113,7 +113,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT nextval(`test`.`s2`), `d` int(11) DEFAULT lastval(`test`.`s2`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; drop sequence s1; # diff --git a/mysql-test/suite/sql_sequence/mysqldump.result b/mysql-test/suite/sql_sequence/mysqldump.result index fb023cc5e36..47b93eff7d1 100644 --- a/mysql-test/suite/sql_sequence/mysqldump.result +++ b/mysql-test/suite/sql_sequence/mysqldump.result @@ -12,7 +12,7 @@ SELECT SETVAL(`x1`, 1, 0); CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1024; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=1024; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (1),(2); # dump by tables order 1 @@ -25,7 +25,7 @@ SELECT SETVAL(`x1`, 1, 0); CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1024; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=1024; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (1),(2); # dump by tables order 2 @@ -38,7 +38,7 @@ SELECT SETVAL(`x1`, 1, 0); CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1024; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=1024; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (1),(2); # dump by tables only tables @@ -47,7 +47,7 @@ INSERT INTO `t1` VALUES (1),(2); CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1024; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=1024; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (1),(2); # dump by tables only sequences |