diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-09-22 15:30:24 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-09-22 15:30:24 +0300 |
| commit | 3e83c4e8f90851040be921443b52144a2862444a (patch) | |
| tree | f76ee35018c73f2034e0e6e42c89c038f920f495 /mysql-test/suite/maria | |
| parent | 513923868545338c00390f35f63b92efd55f50bb (diff) | |
| parent | 79feec77ed4a7121e68be1dc16f79dcad6c5d25e (diff) | |
| download | mariadb-git-3e83c4e8f90851040be921443b52144a2862444a.tar.gz | |
Automatic merge
Diffstat (limited to 'mysql-test/suite/maria')
| -rw-r--r-- | mysql-test/suite/maria/maria3.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/mrr.result | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/maria/maria3.result b/mysql-test/suite/maria/maria3.result index 37613875f38..27d72b75930 100644 --- a/mysql-test/suite/maria/maria3.result +++ b/mysql-test/suite/maria/maria3.result @@ -452,6 +452,8 @@ SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'; CREATE TABLE t1 (id int(11) PRIMARY KEY auto_increment,f1 varchar(10) NOT NULL UNIQUE); INSERT IGNORE INTO t1 (f1) VALUES ("test1"); INSERT IGNORE INTO t1 (f1) VALUES ("test1"); +Warnings: +Warning 1062 Duplicate entry 'test1' for key 'f1' INSERT IGNORE INTO t1 (f1) VALUES ("test2"); SELECT * FROM t1; id f1 diff --git a/mysql-test/suite/maria/mrr.result b/mysql-test/suite/maria/mrr.result index af7789eebff..06be64566e5 100644 --- a/mysql-test/suite/maria/mrr.result +++ b/mysql-test/suite/maria/mrr.result @@ -277,6 +277,8 @@ bb-1 NULL cc-2 NULL-1 drop table t1, t2, t3, t4; create table t1 (a int, b int not null,unique key (a,b),index(b)); insert ignore into t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(null,7),(9,9),(8,8),(7,7),(null,9),(null,9),(6,6); +Warnings: +Warning 1062 Duplicate entry '6-6' for key 'a' create table t2 like t1; insert into t2 select * from t1; alter table t1 modify b blob not null, add c int not null, drop key a, add unique key (a,b(20),c), drop key b, add key (b(10)); |