merging: results adjusted

mysql-test/r/ctype_big5.result

@@ -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))
 

mysql-test/r/ctype_euckr.result

@@ -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))
 

mysql-test/r/ctype_gb2312.result

@@ -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))
 

mysql-test/r/ctype_gbk.result

@@ -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))
 

mysql-test/r/ctype_uca.result

@@ -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))