diff options
author | Alexander Barkov <bar@mariadb.com> | 2022-09-02 17:32:14 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2022-09-12 22:10:39 +0400 |
commit | f1544424de2b8c9d1c3faefbbdd15543db7dfd12 (patch) | |
tree | ebac7186e67915f333a5e9fec2e801ae45c8eccc /mysql-test/suite/jp/r/jp_enum_utf8.result | |
parent | 667df98c3e0f32d391af4eb65c618043720b6a2f (diff) | |
download | mariadb-git-f1544424de2b8c9d1c3faefbbdd15543db7dfd12.tar.gz |
MDEV-29446 Change SHOW CREATE TABLE to display default collation
Diffstat (limited to 'mysql-test/suite/jp/r/jp_enum_utf8.result')
-rw-r--r-- | mysql-test/suite/jp/r/jp_enum_utf8.result | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/mysql-test/suite/jp/r/jp_enum_utf8.result b/mysql-test/suite/jp/r/jp_enum_utf8.result index 861aef0462d..ded1ca61f2b 100644 --- a/mysql-test/suite/jp/r/jp_enum_utf8.result +++ b/mysql-test/suite/jp/r/jp_enum_utf8.result @@ -77,55 +77,55 @@ Table Create Table T1 CREATE TABLE `T1` ( `C1` enum('ア','イ','ウ') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T2`; Table Create Table T2 CREATE TABLE `T2` ( `C1` enum('あ','い','う') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T3`; Table Create Table T3 CREATE TABLE `T3` ( `C1` enum('龔','龖','龗') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T4`; Table Create Table T4 CREATE TABLE `T4` ( `C1` enum('ア','イ','ウ') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T5`; Table Create Table T5 CREATE TABLE `T5` ( `C1` enum('あ','い','う') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T6`; Table Create Table T6 CREATE TABLE `T6` ( `C1` enum('龔','龖','龗') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T7`; Table Create Table T7 CREATE TABLE `T7` ( `C1` enum('ア','イ','ウ') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T8`; Table Create Table T8 CREATE TABLE `T8` ( `C1` enum('あ','い','う') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T9`; Table Create Table T9 CREATE TABLE `T9` ( `C1` enum('龔','龖','龗') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci DESC `T1`; Field Type Null Key Default Extra C1 enum('ア','イ','ウ') YES MUL NULL @@ -168,63 +168,63 @@ Table Create Table `C2` char(1) NOT NULL, `C1` enum('ア','イ','ウ') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T2`; Table Create Table T2 CREATE TABLE `T2` ( `C2` char(1) NOT NULL, `C1` enum('あ','い','う') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T3`; Table Create Table T3 CREATE TABLE `T3` ( `C2` char(1) NOT NULL, `C1` enum('龔','龖','龗') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T4`; Table Create Table T4 CREATE TABLE `T4` ( `C2` char(1) NOT NULL, `C1` enum('ア','イ','ウ') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T5`; Table Create Table T5 CREATE TABLE `T5` ( `C2` char(1) NOT NULL, `C1` enum('あ','い','う') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T6`; Table Create Table T6 CREATE TABLE `T6` ( `C2` char(1) NOT NULL, `C1` enum('龔','龖','龗') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T7`; Table Create Table T7 CREATE TABLE `T7` ( `C2` char(1) NOT NULL, `C1` enum('ア','イ','ウ') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T8`; Table Create Table T8 CREATE TABLE `T8` ( `C2` char(1) NOT NULL, `C1` enum('あ','い','う') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW CREATE TABLE `T9`; Table Create Table T9 CREATE TABLE `T9` ( `C2` char(1) NOT NULL, `C1` enum('龔','龖','龗') DEFAULT NULL, KEY `C1` (`C1`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci DESC `T1`; Field Type Null Key Default Extra C2 char(1) NO NULL |