database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.10 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2022-09-21 11:25:57 +03:00
parent 6ebdd3013a 5e996fbad9
commit 49cee4e21a
1257 changed files with 32337 additions and 30994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/main/create_or_replace2.result
View File

@ -16,7 +16,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
KEY `a` (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
connection slave;
SHOW TABLES;
Tables_in_test
@ -27,7 +27,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
KEY `a` (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
connection master;
drop temporary table if exists tmp;
drop table t1;
@ -49,7 +49,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL,
PRIMARY KEY (`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
@ -57,7 +57,7 @@ t2 CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL,
KEY `t1_a` (`a`),
CONSTRAINT `t1_a` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t2;
c a
2 2