bk commit into 5.0 tree (ramil:1.2527)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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, 2007-10-04 12:09:22+05:00, ramil@stripped +5 -0
  merging: results adjusted

  mysql-test/r/ctype_big5.result@stripped, 2007-10-04 12:09:20+05:00, ramil@stripped +2 -0
    merging: results adjusted

  mysql-test/r/ctype_euckr.result@stripped, 2007-10-04 12:09:20+05:00, ramil@stripped +2 -0
    merging: results adjusted

  mysql-test/r/ctype_gb2312.result@stripped, 2007-10-04 12:09:20+05:00, ramil@stripped +2 -0
    merging: results adjusted

  mysql-test/r/ctype_gbk.result@stripped, 2007-10-04 12:09:20+05:00, ramil@stripped +2 -0
    merging: results adjusted

  mysql-test/r/ctype_uca.result@stripped, 2007-10-04 12:09:20+05:00, ramil@stripped +2 -0
    merging: results adjusted

diff -Nrup a/mysql-test/r/ctype_big5.result b/mysql-test/r/ctype_big5.result
--- a/mysql-test/r/ctype_big5.result	2007-10-04 10:54:48 +05:00
+++ b/mysql-test/r/ctype_big5.result	2007-10-04 12:09:20 +05:00
@@ -54,6 +54,8 @@ 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))
 
diff -Nrup a/mysql-test/r/ctype_euckr.result b/mysql-test/r/ctype_euckr.result
--- a/mysql-test/r/ctype_euckr.result	2007-10-04 10:19:59 +05:00
+++ b/mysql-test/r/ctype_euckr.result	2007-10-04 12:09:20 +05:00
@@ -54,6 +54,8 @@ 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))
 
diff -Nrup a/mysql-test/r/ctype_gb2312.result b/mysql-test/r/ctype_gb2312.result
--- a/mysql-test/r/ctype_gb2312.result	2007-10-04 10:19:59 +05:00
+++ b/mysql-test/r/ctype_gb2312.result	2007-10-04 12:09:20 +05:00
@@ -54,6 +54,8 @@ 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))
 
diff -Nrup a/mysql-test/r/ctype_gbk.result b/mysql-test/r/ctype_gbk.result
--- a/mysql-test/r/ctype_gbk.result	2007-10-04 10:54:48 +05:00
+++ b/mysql-test/r/ctype_gbk.result	2007-10-04 12:09:20 +05:00
@@ -54,6 +54,8 @@ 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))
 
diff -Nrup a/mysql-test/r/ctype_uca.result b/mysql-test/r/ctype_uca.result
--- a/mysql-test/r/ctype_uca.result	2007-10-04 10:54:48 +05:00
+++ b/mysql-test/r/ctype_uca.result	2007-10-04 12:09:20 +05:00
@@ -2589,6 +2589,8 @@ 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))