After merge fix

17d0ff0e · bar@mysql.com/bar.intranet.mysql.r18.ru · 079e4ce9 · 17d0ff0e
Commit 17d0ff0e authored Nov 20, 2006 by bar@mysql.com/bar.intranet.mysql.r18.ru
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/r/ctype_utf8.result mysql-test/r/ctype_utf8.result +1 -1

No files found.
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -124,7 +124,7 @@ create table t1 select date_format("2004-01-19 10:10:10", "%Y-%m-%d");
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) character set utf8 DEFAULT NULL
+  `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 date_format("2004-01-19 10:10:10", "%Y-%m-%d")