diff options
author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-10-04 12:09:22 +0500 |
---|---|---|
committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-10-04 12:09:22 +0500 |
commit | 6dc4dfb363ef20f5850a0459d11a8b6ed4777040 (patch) | |
tree | b4a2796c1494e7bfd379ded94cae0117408375ac | |
parent | 1981008587319ee1190145ef651d31e29e75a22a (diff) | |
download | mariadb-git-6dc4dfb363ef20f5850a0459d11a8b6ed4777040.tar.gz |
merging: results adjusted
-rw-r--r-- | mysql-test/r/ctype_big5.result | 2 | ||||
-rw-r--r-- | mysql-test/r/ctype_euckr.result | 2 | ||||
-rw-r--r-- | mysql-test/r/ctype_gb2312.result | 2 | ||||
-rw-r--r-- | mysql-test/r/ctype_gbk.result | 2 | ||||
-rw-r--r-- | mysql-test/r/ctype_uca.result | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_big5.result b/mysql-test/r/ctype_big5.result index 485b6ec00ae..b190273cc64 100644 --- a/mysql-test/r/ctype_big5.result +++ b/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)) diff --git a/mysql-test/r/ctype_euckr.result b/mysql-test/r/ctype_euckr.result index 2d9f8d217e6..b9619370d4c 100644 --- a/mysql-test/r/ctype_euckr.result +++ b/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)) diff --git a/mysql-test/r/ctype_gb2312.result b/mysql-test/r/ctype_gb2312.result index 04c318e83a8..90c94c3b299 100644 --- a/mysql-test/r/ctype_gb2312.result +++ b/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)) diff --git a/mysql-test/r/ctype_gbk.result b/mysql-test/r/ctype_gbk.result index bc717736e3e..fe90c7bff29 100644 --- a/mysql-test/r/ctype_gbk.result +++ b/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)) diff --git a/mysql-test/r/ctype_uca.result b/mysql-test/r/ctype_uca.result index 8a4f0fd3698..e676d5a5ca0 100644 --- a/mysql-test/r/ctype_uca.result +++ b/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)) |