summaryrefslogtreecommitdiff
path: root/mysql-test/suite/s3
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2022-09-15 07:44:35 +0400
committerAlexander Barkov <bar@mariadb.com>2022-09-15 07:44:35 +0400
commit2fd4d25d8f45a274e5e879daf41ae59a48070eda (patch)
tree48cdcbda67971ed60676774a3acb5f9d18ab7bf7 /mysql-test/suite/s3
parent35e18c240b906c6c6cc76fdf9351744642a874fd (diff)
downloadmariadb-git-2fd4d25d8f45a274e5e879daf41ae59a48070eda.tar.gz
A cleanup for MDEV-29446 Change SHOW CREATE TABLE to display default collation
Recording test results according to MDEV-29446 changes: mysql-test/suite/galera/r/galera-features#117.result mysql-test/suite/galera/r/galera_can_run_toi.result mysql-test/suite/galera/r/wsrep_strict_ddl.result mysql-test/suite/s3/alter.result mysql-test/suite/s3/arguments.result mysql-test/suite/s3/basic.result mysql-test/suite/s3/encryption.result mysql-test/suite/s3/innodb.result mysql-test/suite/s3/mysqldump.result mysql-test/suite/s3/partition.result mysql-test/suite/s3/partition_move.result mysql-test/suite/s3/replication_delayed.result mysql-test/suite/s3/replication_mixed.result
Diffstat (limited to 'mysql-test/suite/s3')
-rw-r--r--mysql-test/suite/s3/alter.result16
-rw-r--r--mysql-test/suite/s3/arguments.result6
-rw-r--r--mysql-test/suite/s3/basic.result4
-rw-r--r--mysql-test/suite/s3/encryption.result2
-rw-r--r--mysql-test/suite/s3/innodb.result6
-rw-r--r--mysql-test/suite/s3/mysqldump.result2
-rw-r--r--mysql-test/suite/s3/partition.result6
-rw-r--r--mysql-test/suite/s3/partition_move.result8
-rw-r--r--mysql-test/suite/s3/replication_delayed.result2
-rw-r--r--mysql-test/suite/s3/replication_mixed.result12
10 files changed, 32 insertions, 32 deletions
diff --git a/mysql-test/suite/s3/alter.result b/mysql-test/suite/s3/alter.result
index da9ddb11ea7..fb378e09a5c 100644
--- a/mysql-test/suite/s3/alter.result
+++ b/mysql-test/suite/s3/alter.result
@@ -10,21 +10,21 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
alter table t1 comment="hello";
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 COMMENT='hello'
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='hello'
alter table t1 engine=aria;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 COMMENT='hello'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='hello'
alter table t1 engine=s3;
alter table t1 engine=innodb;
show create table t1;
@@ -32,7 +32,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 COMMENT='hello'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='hello'
select count(*), sum(a), sum(b) from t1;
count(*) sum(a) sum(b)
1000 500500 510500
@@ -50,14 +50,14 @@ Table Create Table
t2 CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
alter table t2 rename to t3, engine=aria;
show create table t3;
Table Create Table
t3 CREATE TABLE `t3` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
select count(*), sum(a), sum(b) from t3;
count(*) sum(a) sum(b)
10 55 155
@@ -73,7 +73,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `compression_algorithm`='zlib'
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 `compression_algorithm`='zlib'
select count(*), sum(a), sum(b) from t1;
count(*) sum(a) sum(b)
1000 500500 510500
@@ -91,7 +91,7 @@ t1 CREATE TABLE `t1` (
`b` int(11) DEFAULT NULL,
`c` int(11) DEFAULT NULL,
`d` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
select count(*), sum(a), sum(b), sum(c), sum(d) from t1;
count(*) sum(a) sum(b) sum(c) sum(d)
10 55 155 NULL NULL
diff --git a/mysql-test/suite/s3/arguments.result b/mysql-test/suite/s3/arguments.result
index 4a371aabc9b..8133af4be08 100644
--- a/mysql-test/suite/s3/arguments.result
+++ b/mysql-test/suite/s3/arguments.result
@@ -11,7 +11,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
KEY `a` (`a`)
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `s3_block_size`=819200 `compression_algorithm`='zlib'
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 `s3_block_size`=819200 `compression_algorithm`='zlib'
alter table t1 engine=s3, s3_block_size=8192;
ERROR HY000: Incorrect value '8192' for option 's3_block_size'
alter table t1 engine=s3, s3_block_size=65536;
@@ -21,7 +21,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
KEY `a` (`a`)
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `compression_algorithm`='zlib' `s3_block_size`=65536
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 `compression_algorithm`='zlib' `s3_block_size`=65536
alter table t1 engine=s3, s3_block_size=100000;
ERROR HY000: Incorrect value '100000' for option 's3_block_size'
show create table t1;
@@ -30,7 +30,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
KEY `a` (`a`)
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `compression_algorithm`='zlib' `s3_block_size`=65536
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 `compression_algorithm`='zlib' `s3_block_size`=65536
alter table t1 engine=s3, compression_algorithm="wss";
ERROR HY000: Incorrect value 'wss' for option 'compression_algorithm'
drop table t1;
diff --git a/mysql-test/suite/s3/basic.result b/mysql-test/suite/s3/basic.result
index ac391ba3574..790806ee43c 100644
--- a/mysql-test/suite/s3/basic.result
+++ b/mysql-test/suite/s3/basic.result
@@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` (
`c` varchar(1000) DEFAULT NULL,
KEY `a` (`a`),
KEY `c` (`c`)
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
select * from information_schema.tables where table_schema="database" and table_name="t1";;
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT MAX_INDEX_LENGTH TEMPORARY
def # t1 BASE TABLE S3 10 Page 10000 567 5677056 # 761856 0 NULL # # # latin1_swedish_ci NULL page_checksum=1 2305843009213685760 #
@@ -102,7 +102,7 @@ t1 CREATE TABLE `t1` (
`c` varchar(1000) DEFAULT NULL,
KEY `a` (`a`),
KEY `c` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
select a,b from t1 limit 10;
a b
1 11
diff --git a/mysql-test/suite/s3/encryption.result b/mysql-test/suite/s3/encryption.result
index c60490d342a..f9be451459c 100644
--- a/mysql-test/suite/s3/encryption.result
+++ b/mysql-test/suite/s3/encryption.result
@@ -15,7 +15,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
ALTER TABLE t1 ENGINE=Aria;
select * from t1;
a
diff --git a/mysql-test/suite/s3/innodb.result b/mysql-test/suite/s3/innodb.result
index eaa9cf93c86..b1aaa9cc7db 100644
--- a/mysql-test/suite/s3/innodb.result
+++ b/mysql-test/suite/s3/innodb.result
@@ -10,21 +10,21 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
alter table t1 comment="hello";
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 COMMENT='hello'
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='hello'
alter table t1 engine=innodb;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 COMMENT='hello'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='hello'
select count(*), sum(a), sum(b) from t1;
count(*) sum(a) sum(b)
1000 500500 510500
diff --git a/mysql-test/suite/s3/mysqldump.result b/mysql-test/suite/s3/mysqldump.result
index 947fdc20506..513dd397a17 100644
--- a/mysql-test/suite/s3/mysqldump.result
+++ b/mysql-test/suite/s3/mysqldump.result
@@ -21,7 +21,7 @@ CREATE TABLE `t1` (
`pk` int(11) NOT NULL,
`a` int(11) DEFAULT NULL,
PRIMARY KEY (`pk`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1;
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1;
/*!40101 SET character_set_client = @saved_cs_client */;
INSERT INTO `t1` VALUES (1,1),(2,2),(3,3),(4,4);
ALTER TABLE `t1` ENGINE=S3;
diff --git a/mysql-test/suite/s3/partition.result b/mysql-test/suite/s3/partition.result
index 86a70b3c694..bc411be9cf6 100644
--- a/mysql-test/suite/s3/partition.result
+++ b/mysql-test/suite/s3/partition.result
@@ -90,7 +90,7 @@ Table Create Table
t2 CREATE TABLE `t2` (
`c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY RANGE (`c1`)
SUBPARTITION BY HASH (`c2`)
SUBPARTITIONS 2
@@ -110,7 +110,7 @@ Table Create Table
t2 CREATE TABLE `t2` (
`c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY RANGE (`c1`)
SUBPARTITION BY HASH (`c2`)
SUBPARTITIONS 2
@@ -136,7 +136,7 @@ Table Create Table
t2 CREATE TABLE `t2` (
`c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
SELECT count(*) FROM t2;
count(*)
4
diff --git a/mysql-test/suite/s3/partition_move.result b/mysql-test/suite/s3/partition_move.result
index e183334f083..8bd1b53e06f 100644
--- a/mysql-test/suite/s3/partition_move.result
+++ b/mysql-test/suite/s3/partition_move.result
@@ -12,7 +12,7 @@ archive CREATE TABLE `archive` (
`c1` int(11) NOT NULL,
`c2` int(11) DEFAULT NULL,
PRIMARY KEY (`c1`)
-) ENGINE=S3 DEFAULT CHARSET=latin1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY RANGE (`c1`)
(PARTITION `p0` VALUES LESS THAN (100) ENGINE = S3)
CREATE TABLE t1 (
@@ -34,7 +34,7 @@ p1 CREATE TABLE `p1` (
`c1` int(11) NOT NULL,
`c2` int(11) DEFAULT NULL,
PRIMARY KEY (`c1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select count(*) from p1;
count(*)
100
@@ -51,7 +51,7 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` int(11) DEFAULT NULL,
PRIMARY KEY (`c1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY RANGE (`c1`)
(PARTITION `p2` VALUES LESS THAN (300) ENGINE = InnoDB,
PARTITION `p3` VALUES LESS THAN (400) ENGINE = InnoDB)
@@ -61,7 +61,7 @@ archive CREATE TABLE `archive` (
`c1` int(11) NOT NULL,
`c2` int(11) DEFAULT NULL,
PRIMARY KEY (`c1`)
-) ENGINE=S3 DEFAULT CHARSET=latin1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY RANGE (`c1`)
(PARTITION `p0` VALUES LESS THAN (100) ENGINE = S3,
PARTITION `p1` VALUES LESS THAN (200) ENGINE = S3)
diff --git a/mysql-test/suite/s3/replication_delayed.result b/mysql-test/suite/s3/replication_delayed.result
index cad8b905d0b..706fcfe6d7e 100644
--- a/mysql-test/suite/s3/replication_delayed.result
+++ b/mysql-test/suite/s3/replication_delayed.result
@@ -42,7 +42,7 @@ show create table t100;
Table Create Table
t100 CREATE TABLE `t100` (
`pk` varchar(100) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
connection slave;
select count(*) from t100;
count(*)
diff --git a/mysql-test/suite/s3/replication_mixed.result b/mysql-test/suite/s3/replication_mixed.result
index 6b9b87a7891..80a32b28d8a 100644
--- a/mysql-test/suite/s3/replication_mixed.result
+++ b/mysql-test/suite/s3/replication_mixed.result
@@ -21,7 +21,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
connection slave;
use database;
select * from t1 limit 2;
@@ -84,7 +84,7 @@ t1 CREATE TABLE `t1` (
`c` int(11) DEFAULT NULL,
`d` int(11) DEFAULT NULL,
`e` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
# Convert S3 table to Aria with rename. Rows should be binary logged
connection master;
alter table t1 engine=s3;
@@ -102,7 +102,7 @@ t2 CREATE TABLE `t2` (
`c` int(11) DEFAULT NULL,
`d` int(11) DEFAULT NULL,
`e` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
connection master;
drop table t2;
connection slave;
@@ -154,7 +154,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
`c` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
select * from t1 limit 2;
a b c
select * from t2 limit 2;
@@ -217,7 +217,7 @@ slave-bin.000001 # Query # # use `database`; CREATE OR REPLACE TABLE `t1` (
`c` int(11) DEFAULT NULL,
`d` int(11) DEFAULT NULL,
`e` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
slave-bin.000001 # Annotate_rows # # alter table t1 engine=aria
slave-bin.000001 # Table_map # # table_id: # (database.t1)
slave-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F
@@ -232,7 +232,7 @@ slave-bin.000001 # Query # # use `database`; CREATE OR REPLACE TABLE `t2` (
`c` int(11) DEFAULT NULL,
`d` int(11) DEFAULT NULL,
`e` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
slave-bin.000001 # Annotate_rows # # alter table t1 rename t2, engine=aria
slave-bin.000001 # Table_map # # table_id: # (database.t2)
slave-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F
View Lorry Controller Status