bk commit into 5.0 tree (bar:1.2580)

[bar]

Below is the list of changes that have just been committed into a local
5.0 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-06 09:58:49+04:00, bar@stripped +3 -0
  additional test fixes for bug 27580

  mysql-test/r/ctype_cp1250_ch.result@stripped, 2008-03-06 09:58:47+04:00, bar@stripped +34 -0
    additional test fixes for bug 27580

  mysql-test/r/ctype_cp932.result@stripped, 2008-03-06 09:58:47+04:00, bar@stripped +19 -0
    additional test fixes for bug 27580

  mysql-test/r/ctype_ucs.result@stripped, 2008-03-06 09:58:47+04:00, bar@stripped +17 -0
    additional test fixes for bug 27580

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	2007-10-08 12:46:36 +05:00
+++ b/mysql-test/r/ctype_cp1250_ch.result	2008-03-06 09:58:47 +04:00
@@ -57,6 +57,23 @@ SELECT c1 as want1result  from t1 where 
 want1result
 location
 DROP TABLE t1;
+create table t1 (a set('a') not null);
+insert into t1 values (),();
+Warnings:
+Warning	1364	Field 'a' doesn't have a default value
+select cast(a as char(1)) from t1;
+cast(a as char(1))
+
+
+select a sounds like a from t1;
+a sounds like a
+1
+1
+select 1 from t1 order by cast(a as char(1));
+1
+1
+1
+drop table t1;
 set names utf8;
 create table t1 (
 name varchar(10),
@@ -133,6 +150,23 @@ SELECT c1 as want1result  from t1 where 
 want1result
 location
 DROP TABLE t1;
+create table t1 (a set('a') not null);
+insert into t1 values (),();
+Warnings:
+Warning	1364	Field 'a' doesn't have a default value
+select cast(a as char(1)) from t1;
+cast(a as char(1))
+
+
+select a sounds like a from t1;
+a sounds like a
+1
+1
+select 1 from t1 order by cast(a as char(1));
+1
+1
+1
+drop table t1;
 set names utf8;
 create table t1 (
 name varchar(10),
diff -Nrup a/mysql-test/r/ctype_cp932.result b/mysql-test/r/ctype_cp932.result
--- a/mysql-test/r/ctype_cp932.result	2007-11-28 10:55:11 +04:00
+++ b/mysql-test/r/ctype_cp932.result	2008-03-06 09:58:47 +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/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
--- a/mysql-test/r/ctype_ucs.result	2008-03-06 08:35:05 +04:00
+++ b/mysql-test/r/ctype_ucs.result	2008-03-06 09:58:47 +04:00
@@ -54,6 +54,23 @@ SELECT c1 as want1result  from t1 where 
 want1result
 location
 DROP TABLE t1;
+create table t1 (a set('a') not null);
+insert into t1 values (),();
+Warnings:
+Warning	1364	Field 'a' doesn't have a default value
+select cast(a as char(1)) from t1;
+cast(a as char(1))
+
+
+select a sounds like a from t1;
+a sounds like a
+1
+1
+select 1 from t1 order by cast(a as char(1));
+1
+1
+1
+drop table t1;
 set names utf8;
 create table t1 (
 name varchar(10),