diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2004-12-14 16:18:59 +0300 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2004-12-14 16:18:59 +0300 |
| commit | 8d45c5f9d0ed290bb0bb880488b5ff1d5c2c7619 (patch) | |
| tree | 0efae561efb76412837b65de49cc1a56925e9798 /mysql-test | |
| parent | 0d9ac947b07277aa909142a706a06b249cd97adc (diff) | |
| download | mariadb-git-8d45c5f9d0ed290bb0bb880488b5ff1d5c2c7619.tar.gz | |
Fix for bug #7220: information_schema: errors in "character_sets"
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/information_schema.result | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index d2099ed4b22..6c427f7fe1d 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -156,14 +156,14 @@ drop tables testtets.t4, testtets.t1, t2, t3; drop database testtets; select * from information_schema.CHARACTER_SETS where CHARACTER_SET_NAME like 'latin1%'; -CHARACTER_SET_NAME DESCRIPTION DEFAULT_COLLATE_NAME MAXLEN -latin1 ISO 8859-1 West European latin1_swedish_ci 1 +CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN +latin1 latin1_swedish_ci ISO 8859-1 West European 1 SHOW CHARACTER SET LIKE 'latin1%'; Charset Description Default collation Maxlen latin1 ISO 8859-1 West European latin1_swedish_ci 1 SHOW CHARACTER SET * LIKE 'latin1%'; -CHARACTER_SET_NAME DESCRIPTION DEFAULT_COLLATE_NAME MAXLEN -latin1 ISO 8859-1 West European latin1_swedish_ci 1 +CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN +latin1 latin1_swedish_ci ISO 8859-1 West European 1 SHOW CHARACTER SET WHERE CHARACTER_SET_NAME like 'latin1%'; Charset Description Default collation Maxlen latin1 ISO 8859-1 West European latin1_swedish_ci 1 @@ -171,8 +171,8 @@ SHOW CHARACTER SET CHARACTER_SET_NAME WHERE CHARACTER_SET_NAME like 'latin1%'; CHARACTER_SET_NAME latin1 SHOW CHARACTER SET * WHERE CHARACTER_SET_NAME like 'latin1%'; -CHARACTER_SET_NAME DESCRIPTION DEFAULT_COLLATE_NAME MAXLEN -latin1 ISO 8859-1 West European latin1_swedish_ci 1 +CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN +latin1 latin1_swedish_ci ISO 8859-1 West European 1 select * from information_schema.COLLATIONS where COLLATION_NAME like 'latin1%'; COLLATION_NAME CHARSET ID DEFAULT COMPILED SORTLEN @@ -471,8 +471,8 @@ SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets; Table Create Table character_sets CREATE TEMPORARY TABLE `character_sets` ( `CHARACTER_SET_NAME` varchar(30) NOT NULL default '', - `DESCRIPTION` varchar(60) NOT NULL default '', `DEFAULT_COLLATE_NAME` varchar(60) NOT NULL default '', + `DESCRIPTION` varchar(60) NOT NULL default '', `MAXLEN` bigint(3) NOT NULL default '0' ) ENGINE=HEAP DEFAULT CHARSET=utf8 MAX_ROWS=2252 set names latin2; @@ -480,23 +480,23 @@ SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets; Table Create Table character_sets CREATE TEMPORARY TABLE `character_sets` ( `CHARACTER_SET_NAME` varchar(30) NOT NULL default '', - `DESCRIPTION` varchar(60) NOT NULL default '', `DEFAULT_COLLATE_NAME` varchar(60) NOT NULL default '', + `DESCRIPTION` varchar(60) NOT NULL default '', `MAXLEN` bigint(3) NOT NULL default '0' ) ENGINE=HEAP DEFAULT CHARSET=utf8 MAX_ROWS=2252 set names latin1; create table t1 select * from information_schema.CHARACTER_SETS where CHARACTER_SET_NAME like "latin1"; select * from t1; -CHARACTER_SET_NAME DESCRIPTION DEFAULT_COLLATE_NAME MAXLEN -latin1 ISO 8859-1 West European latin1_swedish_ci 1 +CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN +latin1 latin1_swedish_ci ISO 8859-1 West European 1 alter table t1 default character set utf8; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `CHARACTER_SET_NAME` varchar(30) NOT NULL default '', - `DESCRIPTION` varchar(60) NOT NULL default '', `DEFAULT_COLLATE_NAME` varchar(60) NOT NULL default '', + `DESCRIPTION` varchar(60) NOT NULL default '', `MAXLEN` bigint(3) NOT NULL default '0' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 drop table t1; |