bk commit into 5.1 tree (bar:1.2533)

[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, 2008-03-08 01:14:56+04:00, bar@stripped +8 -0
  After merge fix

  mysql-test/r/ctype_cp1250_ch.result@stripped, 2008-03-08 01:14:54+04:00, bar@stripped +4 -4
    After merge fix

  mysql-test/r/ctype_euckr.result@stripped, 2008-03-08 01:14:54+04:00, bar@stripped +2 -2
    After merge fix

  mysql-test/r/ctype_gb2312.result@stripped, 2008-03-08 01:14:54+04:00, bar@stripped +2 -2
    After merge fix

  mysql-test/r/ctype_gbk.result@stripped, 2008-03-08 01:14:54+04:00, bar@stripped +2 -2
    After merge fix

  mysql-test/r/ctype_uca.result@stripped, 2008-03-08 01:14:54+04:00, bar@stripped +2 -2
    After merge fix

  mysql-test/r/ctype_ucs.result@stripped, 2008-03-08 01:14:54+04:00, bar@stripped +2 -2
    After merge fix

  mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result@stripped, 2008-03-08 01:14:54+04:00,
bar@stripped +19 -0
    After merge fix

  mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result@stripped, 2008-03-08 01:14:54+04:00,
bar@stripped +2 -2
    After merge fix

diff -Nrup a/mysql-test/r/ctype_cp1250_ch.result b/mysql-test/r/ctype_cp1250_ch.result
--- a/mysql-test/r/ctype_cp1250_ch.result	2008-03-07 15:18:45 +04:00
+++ b/mysql-test/r/ctype_cp1250_ch.result	2008-03-08 01:14:54 +04:00
@@ -82,8 +82,8 @@ level smallint unsigned);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `name` varchar(10) default NULL,
-  `level` smallint(5) unsigned default NULL
+  `name` varchar(10) DEFAULT NULL,
+  `level` smallint(5) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=cp1250
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
@@ -175,8 +175,8 @@ level smallint unsigned);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `name` varchar(10) collate cp1250_czech_cs default NULL,
-  `level` smallint(5) unsigned default NULL
+  `name` varchar(10) COLLATE cp1250_czech_cs DEFAULT NULL,
+  `level` smallint(5) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=cp1250 COLLATE=cp1250_czech_cs
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
diff -Nrup a/mysql-test/r/ctype_euckr.result b/mysql-test/r/ctype_euckr.result
--- a/mysql-test/r/ctype_euckr.result	2008-03-07 15:18:45 +04:00
+++ b/mysql-test/r/ctype_euckr.result	2008-03-08 01:14:54 +04:00
@@ -78,8 +78,8 @@ level smallint unsigned);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `name` varchar(10) default NULL,
-  `level` smallint(5) unsigned default NULL
+  `name` varchar(10) DEFAULT NULL,
+  `level` smallint(5) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=euckr
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
diff -Nrup a/mysql-test/r/ctype_gb2312.result b/mysql-test/r/ctype_gb2312.result
--- a/mysql-test/r/ctype_gb2312.result	2008-03-06 08:41:03 +04:00
+++ b/mysql-test/r/ctype_gb2312.result	2008-03-08 01:14:54 +04:00
@@ -78,8 +78,8 @@ level smallint unsigned);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `name` varchar(10) default NULL,
-  `level` smallint(5) unsigned default NULL
+  `name` varchar(10) DEFAULT NULL,
+  `level` smallint(5) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=gb2312
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
diff -Nrup a/mysql-test/r/ctype_gbk.result b/mysql-test/r/ctype_gbk.result
--- a/mysql-test/r/ctype_gbk.result	2008-03-06 08:41:03 +04:00
+++ b/mysql-test/r/ctype_gbk.result	2008-03-08 01:14:54 +04:00
@@ -78,8 +78,8 @@ level smallint unsigned);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `name` varchar(10) default NULL,
-  `level` smallint(5) unsigned default NULL
+  `name` varchar(10) DEFAULT NULL,
+  `level` smallint(5) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=gbk
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
diff -Nrup a/mysql-test/r/ctype_uca.result b/mysql-test/r/ctype_uca.result
--- a/mysql-test/r/ctype_uca.result	2008-03-07 15:18:45 +04:00
+++ b/mysql-test/r/ctype_uca.result	2008-03-08 01:14:54 +04:00
@@ -2613,8 +2613,8 @@ level smallint unsigned);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `name` varchar(10) collate utf8_swedish_ci default NULL,
-  `level` smallint(5) unsigned default NULL
+  `name` varchar(10) COLLATE utf8_swedish_ci DEFAULT NULL,
+  `level` smallint(5) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_swedish_ci
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
diff -Nrup a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
--- a/mysql-test/r/ctype_ucs.result	2008-03-07 15:18:45 +04:00
+++ b/mysql-test/r/ctype_ucs.result	2008-03-08 01:14:54 +04:00
@@ -78,8 +78,8 @@ level smallint unsigned);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `name` varchar(10) default NULL,
-  `level` smallint(5) unsigned default NULL
+  `name` varchar(10) DEFAULT NULL,
+  `level` smallint(5) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
diff -Nrup a/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
b/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
--- a/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result	2007-11-29 22:32:32 +04:00
+++ b/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result	2008-03-08 01:14:54 +04:00
@@ -6,6 +6,8 @@ SET @test_character_set= 'cp932';
 SET @test_collation= 'cp932_japanese_ci';
 SET @safe_character_set_server= @@character_set_server;
 SET @safe_collation_server= @@collation_server;
+SET @safe_character_set_client= @@character_set_client;
+SET @safe_character_set_results= @@character_set_results;
 SET character_set_server= @test_character_set;
 SET collation_server= @test_collation;
 CREATE DATABASE d1;
@@ -72,10 +74,27 @@ select 1 from t1 order by cast(a as char
 1
 1
 drop table t1;
+set names utf8;
+create table t1 (
+name varchar(10),
+level smallint unsigned);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `name` varchar(10) DEFAULT NULL,
+  `level` smallint(5) unsigned DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=cp932
+insert into t1 values ('string',1);
+select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
+concat(name,space(level))	concat(name, repeat(' ',level))
+string 	string 
+drop table t1;
 DROP DATABASE d1;
 USE test;
 SET character_set_server= @safe_character_set_server;
 SET collation_server= @safe_collation_server;
+SET character_set_client= @safe_character_set_client;
+SET character_set_results= @safe_character_set_results;
 set names cp932;
 set character_set_database = cp932;
 CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = cp932;
diff -Nrup a/mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result
b/mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result
--- a/mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result	2008-03-07 15:18:45 +04:00
+++ b/mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result	2008-03-08 01:14:54 +04:00
@@ -81,8 +81,8 @@ level smallint unsigned);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `name` varchar(10) default NULL,
-  `level` smallint(5) unsigned default NULL
+  `name` varchar(10) DEFAULT NULL,
+  `level` smallint(5) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=cp932
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;