bk commit into 5.1 tree (bar:1.2368)

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-20 18:05:01+04:00, bar@stripped +1 -0
  After merge fix

  mysql-test/r/ctype_utf8.result@stripped, 2006-11-20 18:04:57+04:00, bar@stripped +1 -1
    After merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1.b22646

--- 1.112/mysql-test/r/ctype_utf8.result	2006-11-20 18:05:12 +04:00
+++ 1.113/mysql-test/r/ctype_utf8.result	2006-11-20 18:05:12 +04:00
@@ -124,7 +124,7 @@ create table t1 select date_format("2004
 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")