diff options
author | unknown <tsmith@maint1.mysql.com> | 2007-07-04 21:22:35 +0200 |
---|---|---|
committer | unknown <tsmith@maint1.mysql.com> | 2007-07-04 21:22:35 +0200 |
commit | 1b827e039923bff91c3f909dd726841404b1e6d4 (patch) | |
tree | b9486f8c30ebfa7de4e0cb336600162a6e18c593 /mysql-test/r | |
parent | 58419e9e18396d11984015dd7622d9f1c7304fba (diff) | |
parent | 7fbf6303d264a84bd225e0113a910459a067e3d0 (diff) | |
download | mariadb-git-1b827e039923bff91c3f909dd726841404b1e6d4.tar.gz |
Merge maint1.mysql.com:/data/localhome/tsmith/bk/41
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/type_enum.result | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/r/type_enum.result b/mysql-test/r/type_enum.result index b5ec72ffe5a..415c391ebb8 100644 --- a/mysql-test/r/type_enum.result +++ b/mysql-test/r/type_enum.result @@ -1778,4 +1778,27 @@ drop table t1; create table t1(exhausting_charset enum('ABCDEFGHIJKLMNOPQRSTUVWXYZ','
!"','#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~','xx\','yy\','zz')); ERROR 42000: Field separator argument is not what is expected; check the manual +CREATE TABLE t1 ( +id INT AUTO_INCREMENT PRIMARY KEY, +c1 ENUM('a', '', 'b') +); +INSERT INTO t1 (c1) VALUES (0), ('a'), (''), ('b'); +Warnings: +Warning 1265 Data truncated for column 'c1' at row 1 +SELECT id, c1 + 0, c1 FROM t1; +id c1 + 0 c1 +1 0 +2 1 a +3 2 +4 3 b +ALTER TABLE t1 CHANGE c1 c1 ENUM('a', '') NOT NULL; +Warnings: +Warning 1265 Data truncated for column 'c1' at row 4 +SELECT id, c1 + 0, c1 FROM t1; +id c1 + 0 c1 +1 0 +2 1 a +3 2 +4 0 +DROP TABLE t1; End of 4.1 tests |