diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-13 16:36:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-13 16:36:38 +0300 |
| commit | 18795f55122b04cb5c9ea19498b720735b80714b (patch) | |
| tree | 1a749eeaaabaa86e9b755cef817a6267a6b59960 /mysql-test/suite/innodb/r/innodb_mysql.result | |
| parent | 9a8faeea142ea6f575419799c9439f4673971573 (diff) | |
| parent | 68ce0231ad6a16e02db9d67a217a88055b6d01ff (diff) | |
| download | mariadb-git-18795f55122b04cb5c9ea19498b720735b80714b.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb_mysql.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_mysql.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index acd66549d42..48f3da81e72 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -1000,7 +1000,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='123' +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='123' drop table t1; CREATE TABLE t1 (a CHAR(2), KEY (a)) ENGINE = InnoDB DEFAULT CHARSET=UTF8; INSERT INTO t1 VALUES ('uk'),('bg'); @@ -1564,7 +1564,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` text DEFAULT NULL, KEY `a` (`a`(1024)) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci drop table t1; CREATE TABLE t1 ( a INT, @@ -1780,7 +1780,7 @@ t1 CREATE TABLE `t1` ( `b` char(4) NOT NULL, UNIQUE KEY `bb` (`b`), UNIQUE KEY `aa` (`a`(1)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; CREATE TABLE t1 (id int, type char(6), d int, INDEX idx(id,d)) ENGINE=InnoDB; INSERT INTO t1 VALUES @@ -1855,7 +1855,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f1`), KEY `f2_ref` (`f2`), CONSTRAINT `f2_ref` FOREIGN KEY (`f2`) REFERENCES `t1` (`f1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # # Bug #36995: valgrind error in remove_const during subquery executions @@ -2142,7 +2142,7 @@ t2 CREATE TABLE `t2` ( CONSTRAINT `c2` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION, CONSTRAINT `f3` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; create table t1 (a int auto_increment primary key) engine=innodb; @@ -3204,7 +3204,7 @@ t2 CREATE TABLE `t2` ( `fk` int(11) DEFAULT NULL, KEY `x` (`fk`), CONSTRAINT `x` FOREIGN KEY (`fk`) REFERENCES `t1` (`pk`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t2, t1; # # Test for bug #11762012 - "54553: INNODB ASSERTS IN HA_INNOBASE:: |