From 482cf550f9cb1bf060aba73ef64d85edee791118 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 21 Jul 2005 18:43:55 +0500 Subject: [PATCH] merge fix --- mysql-test/r/information_schema.result | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 01abd791881..89b3df0a83b 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -182,13 +182,13 @@ drop database mysqltest; select * from information_schema.CHARACTER_SETS where CHARACTER_SET_NAME like 'latin1%'; CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN -latin1 latin1_swedish_ci ISO 8859-1 West European 1 +latin1 latin1_swedish_ci cp1252 West European 1 SHOW CHARACTER SET LIKE 'latin1%'; Charset Description Default collation Maxlen -latin1 ISO 8859-1 West European latin1_swedish_ci 1 +latin1 cp1252 West European latin1_swedish_ci 1 SHOW CHARACTER SET WHERE charset like 'latin1%'; Charset Description Default collation Maxlen -latin1 ISO 8859-1 West European latin1_swedish_ci 1 +latin1 cp1252 West European latin1_swedish_ci 1 select * from information_schema.COLLATIONS where COLLATION_NAME like 'latin1%'; COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN @@ -501,7 +501,7 @@ create table t1 select * from information_schema.CHARACTER_SETS where CHARACTER_SET_NAME like "latin1"; select * from t1; CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN -latin1 latin1_swedish_ci ISO 8859-1 West European 1 +latin1 latin1_swedish_ci cp1252 West European 1 alter table t1 default character set utf8; show create table t1; Table Create Table