summaryrefslogtreecommitdiff
path: root/mysql-test/r/strict.result
diff options
context:
space:
mode:
authorigor@olga.mysql.com <>2007-04-11 15:12:49 -0700
committerigor@olga.mysql.com <>2007-04-11 15:12:49 -0700
commite04289704d10c627099cee7600d95baff960aff5 (patch)
tree745c1c31dac527903107001ecc721039f66d0e96 /mysql-test/r/strict.result
parent26d2908c70a259561d307e54f1b1320bb640bd00 (diff)
parent4bf11f99eb82e37b575bc83db71e021cdfd5cf9f (diff)
downloadmariadb-git-e04289704d10c627099cee7600d95baff960aff5.tar.gz
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/mysql-5.1-opt
Diffstat (limited to 'mysql-test/r/strict.result')
-rw-r--r--mysql-test/r/strict.result5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result
index 74cd723e130..a2cc3ce4d75 100644
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -1386,4 +1386,9 @@ ERROR 01000: Data truncated for column 'a' at row 1
insert into t1 values ('2E3x');
ERROR 01000: Data truncated for column 'a' at row 1
drop table t1;
+set sql_mode='traditional';
+create table t1 (f1 set('a','a'));
+ERROR HY000: Column 'f1' has duplicated value 'a' in SET
+create table t1 (f1 enum('a','a'));
+ERROR HY000: Column 'f1' has duplicated value 'a' in ENUM
End of 5.0 tests