Skip to content

M
MariaDB
Commit 289105e2 authored by Alexander Barkov's avatar Alexander Barkov
Browse files
Options

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/MDEV-25494.result
  mysql-test/suite/galera/r/galera_ctas.result
  mysql-test/suite/galera/r/galera_schema.result
  mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result
  mysql-test/suite/galera_sr/r/galera_sr_create_drop.result
parent 18795f55
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
mysql-test/suite/galera/r/MDEV-25494.result
View file @ 289105e2
...@@ -10,5 +10,5 @@ Table Create Table ...@@ -10,5 +10,5 @@ Table Create Table
t CREATE TEMPORARY TABLE `t` ( t CREATE TEMPORARY TABLE `t` (
`i` int(11) DEFAULT NULL, `i` int(11) DEFAULT NULL,
`extrac` char(1) DEFAULT NULL `extrac` char(1) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
DROP TABLE t; DROP TABLE t;
mysql-test/suite/galera/r/galera_ctas.result
View file @ 289105e2
...@@ -17,21 +17,21 @@ t2 CREATE TABLE `t2` ( ...@@ -17,21 +17,21 @@ t2 CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`count` int(11) DEFAULT NULL, `count` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
SHOW CREATE TABLE t3; SHOW CREATE TABLE t3;
Table Create Table Table Create Table
t3 CREATE TABLE `t3` ( t3 CREATE TABLE `t3` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`count` int(11) DEFAULT NULL, `count` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
SHOW CREATE TABLE t4; SHOW CREATE TABLE t4;
Table Create Table Table Create Table
t4 CREATE TABLE `t4` ( t4 CREATE TABLE `t4` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`count` int(11) DEFAULT NULL, `count` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
DROP TABLE t2, t3,t4; DROP TABLE t2, t3,t4;
SET SESSION default_storage_engine=Aria; SET SESSION default_storage_engine=Aria;
CREATE TABLE t2 AS SELECT * FROM t1_Aria; CREATE TABLE t2 AS SELECT * FROM t1_Aria;
...@@ -43,21 +43,21 @@ t2 CREATE TABLE `t2` ( ...@@ -43,21 +43,21 @@ t2 CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`count` int(11) DEFAULT NULL, `count` int(11) DEFAULT NULL,
`b` 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
SHOW CREATE TABLE t3; SHOW CREATE TABLE t3;
Table Create Table Table Create Table
t3 CREATE TABLE `t3` ( t3 CREATE TABLE `t3` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`count` int(11) DEFAULT NULL, `count` int(11) DEFAULT NULL,
`b` 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
SHOW CREATE TABLE t4; SHOW CREATE TABLE t4;
Table Create Table Table Create Table
t4 CREATE TABLE `t4` ( t4 CREATE TABLE `t4` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`count` int(11) DEFAULT NULL, `count` int(11) DEFAULT NULL,
`b` 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
DROP TABLE t2, t3,t4; DROP TABLE t2, t3,t4;
SET SESSION default_storage_engine=InnoDB; SET SESSION default_storage_engine=InnoDB;
CREATE TABLE t2 AS SELECT * FROM t1_Aria; CREATE TABLE t2 AS SELECT * FROM t1_Aria;
...@@ -69,20 +69,20 @@ t2 CREATE TABLE `t2` ( ...@@ -69,20 +69,20 @@ t2 CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`count` int(11) DEFAULT NULL, `count` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
SHOW CREATE TABLE t3; SHOW CREATE TABLE t3;
Table Create Table Table Create Table
t3 CREATE TABLE `t3` ( t3 CREATE TABLE `t3` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`count` int(11) DEFAULT NULL, `count` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
SHOW CREATE TABLE t4; SHOW CREATE TABLE t4;
Table Create Table Table Create Table
t4 CREATE TABLE `t4` ( t4 CREATE TABLE `t4` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`count` int(11) DEFAULT NULL, `count` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
DROP TABLE t2, t3,t4; DROP TABLE t2, t3,t4;
DROP TABLE t1_MyISAM, t1_Aria,t1_InnoDB; DROP TABLE t1_MyISAM, t1_Aria,t1_InnoDB;
mysql-test/suite/galera/r/galera_schema.result
View file @ 289105e2
...@@ -48,7 +48,7 @@ wsrep_cluster CREATE TABLE `wsrep_cluster` ( ...@@ -48,7 +48,7 @@ wsrep_cluster CREATE TABLE `wsrep_cluster` (
`protocol_version` int(11) NOT NULL, `protocol_version` int(11) NOT NULL,
`capabilities` int(11) NOT NULL, `capabilities` int(11) NOT NULL,
PRIMARY KEY (`cluster_uuid`) PRIMARY KEY (`cluster_uuid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0
SHOW CREATE TABLE wsrep_cluster_members; SHOW CREATE TABLE wsrep_cluster_members;
Table Create Table Table Create Table
wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` ( wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` (
...@@ -57,7 +57,7 @@ wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` ( ...@@ -57,7 +57,7 @@ wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` (
`node_name` char(32) NOT NULL, `node_name` char(32) NOT NULL,
`node_incoming_address` varchar(256) NOT NULL, `node_incoming_address` varchar(256) NOT NULL,
PRIMARY KEY (`node_uuid`) PRIMARY KEY (`node_uuid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0
SHOW CREATE TABLE wsrep_cluster_members_history; SHOW CREATE TABLE wsrep_cluster_members_history;
Table Create Table Table Create Table
wsrep_cluster_members_history CREATE TABLE `wsrep_cluster_members_history` ( wsrep_cluster_members_history CREATE TABLE `wsrep_cluster_members_history` (
...@@ -68,7 +68,7 @@ wsrep_cluster_members_history CREATE TABLE `wsrep_cluster_members_history` ( ...@@ -68,7 +68,7 @@ wsrep_cluster_members_history CREATE TABLE `wsrep_cluster_members_history` (
`node_name` char(32) NOT NULL, `node_name` char(32) NOT NULL,
`node_incoming_address` varchar(256) NOT NULL, `node_incoming_address` varchar(256) NOT NULL,
PRIMARY KEY (`node_uuid`) PRIMARY KEY (`node_uuid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0
SHOW CREATE TABLE wsrep_streaming_log; SHOW CREATE TABLE wsrep_streaming_log;
Table Create Table Table Create Table
wsrep_streaming_log CREATE TABLE `wsrep_streaming_log` ( wsrep_streaming_log CREATE TABLE `wsrep_streaming_log` (
...@@ -78,7 +78,7 @@ wsrep_streaming_log CREATE TABLE `wsrep_streaming_log` ( ...@@ -78,7 +78,7 @@ wsrep_streaming_log CREATE TABLE `wsrep_streaming_log` (
`flags` int(11) NOT NULL, `flags` int(11) NOT NULL,
`frag` longblob NOT NULL, `frag` longblob NOT NULL,
PRIMARY KEY (`node_uuid`,`trx_id`,`seqno`) PRIMARY KEY (`node_uuid`,`trx_id`,`seqno`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0
SHOW CREATE TABLE mysql.wsrep_cluster; SHOW CREATE TABLE mysql.wsrep_cluster;
Table Create Table Table Create Table
wsrep_cluster CREATE TABLE `wsrep_cluster` ( wsrep_cluster CREATE TABLE `wsrep_cluster` (
...@@ -88,7 +88,7 @@ wsrep_cluster CREATE TABLE `wsrep_cluster` ( ...@@ -88,7 +88,7 @@ wsrep_cluster CREATE TABLE `wsrep_cluster` (
`protocol_version` int(11) NOT NULL, `protocol_version` int(11) NOT NULL,
`capabilities` int(11) NOT NULL, `capabilities` int(11) NOT NULL,
PRIMARY KEY (`cluster_uuid`) PRIMARY KEY (`cluster_uuid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0
SHOW CREATE TABLE mysql.wsrep_cluster_members; SHOW CREATE TABLE mysql.wsrep_cluster_members;
Table Create Table Table Create Table
wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` ( wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` (
...@@ -97,7 +97,7 @@ wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` ( ...@@ -97,7 +97,7 @@ wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` (
`node_name` char(32) NOT NULL, `node_name` char(32) NOT NULL,
`node_incoming_address` varchar(256) NOT NULL, `node_incoming_address` varchar(256) NOT NULL,
PRIMARY KEY (`node_uuid`) PRIMARY KEY (`node_uuid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0
SHOW CREATE TABLE mysql.wsrep_streaming_log; SHOW CREATE TABLE mysql.wsrep_streaming_log;
Table Create Table Table Create Table
wsrep_streaming_log CREATE TABLE `wsrep_streaming_log` ( wsrep_streaming_log CREATE TABLE `wsrep_streaming_log` (
...@@ -107,7 +107,7 @@ wsrep_streaming_log CREATE TABLE `wsrep_streaming_log` ( ...@@ -107,7 +107,7 @@ wsrep_streaming_log CREATE TABLE `wsrep_streaming_log` (
`flags` int(11) NOT NULL, `flags` int(11) NOT NULL,
`frag` longblob NOT NULL, `frag` longblob NOT NULL,
PRIMARY KEY (`node_uuid`,`trx_id`,`seqno`) PRIMARY KEY (`node_uuid`,`trx_id`,`seqno`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0
DROP TABLE wsrep_cluster; DROP TABLE wsrep_cluster;
DROP TABLE wsrep_cluster_members; DROP TABLE wsrep_cluster_members;
DROP TABLE wsrep_cluster_members_history; DROP TABLE wsrep_cluster_members_history;
......
mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result
View file @ 289105e2
...@@ -14,7 +14,7 @@ wsrep_cluster CREATE TABLE `wsrep_cluster` ( ...@@ -14,7 +14,7 @@ wsrep_cluster CREATE TABLE `wsrep_cluster` (
`protocol_version` int(11) NOT NULL, `protocol_version` int(11) NOT NULL,
`capabilities` int(11) NOT NULL, `capabilities` int(11) NOT NULL,
PRIMARY KEY (`cluster_uuid`) PRIMARY KEY (`cluster_uuid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0
SHOW CREATE TABLE mysql.wsrep_cluster_members; SHOW CREATE TABLE mysql.wsrep_cluster_members;
Table Create Table Table Create Table
wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` ( wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` (
...@@ -23,7 +23,7 @@ wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` ( ...@@ -23,7 +23,7 @@ wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` (
`node_name` char(32) NOT NULL, `node_name` char(32) NOT NULL,
`node_incoming_address` varchar(256) NOT NULL, `node_incoming_address` varchar(256) NOT NULL,
PRIMARY KEY (`node_uuid`) PRIMARY KEY (`node_uuid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0
SELECT COUNT(*) AS EXPECT_1 FROM mysql.wsrep_cluster; SELECT COUNT(*) AS EXPECT_1 FROM mysql.wsrep_cluster;
EXPECT_1 EXPECT_1
1 1
......
mysql-test/suite/galera_sr/r/galera_sr_create_drop.result
View file @ 289105e2
...@@ -8,7 +8,7 @@ Table Create Table ...@@ -8,7 +8,7 @@ Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`f1` int(11) NOT NULL, `f1` int(11) NOT NULL,
PRIMARY KEY (`f1`) PRIMARY KEY (`f1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
connection node_1; connection node_1;
DROP TABLE t1; DROP TABLE t1;
connection node_2; connection node_2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7