diff options
| author | unknown <igor@olga.mysql.com> | 2007-04-11 15:12:49 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-04-11 15:12:49 -0700 |
| commit | 91d3299ce6cf7c8a8da3dc28eafbfec9bf76223c (patch) | |
| tree | 745c1c31dac527903107001ecc721039f66d0e96 /mysql-test/r/strict.result | |
| parent | 37feda2596128fec33ac0e4fe8ff0cd35efd1dec (diff) | |
| parent | 7c4db88a922ba635a79d9ffc8b34a5813c66eba8 (diff) | |
| download | mariadb-git-91d3299ce6cf7c8a8da3dc28eafbfec9bf76223c.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/mysql-5.1-opt
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/row.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/item_cmpfunc.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/strict.result')
| -rw-r--r-- | mysql-test/r/strict.result | 5 |
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 |