diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-06-07 13:50:45 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-06-07 13:50:45 +0300 |
| commit | 1531ab871092791a384da81e76e8e9199aaf1097 (patch) | |
| tree | a2ee1695fe3edd5d6a16aa314e42da91e5c6504d /mysql-test | |
| parent | c7787f8af1be3b64e22fd00659b453972b94476c (diff) | |
| parent | e70af5bef09d5aa9e72aaf8146b67128c094da2d (diff) | |
| download | mariadb-git-1531ab871092791a384da81e76e8e9199aaf1097.tar.gz | |
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/innodb.result | 12 | ||||
| -rw-r--r-- | mysql-test/t/innodb.test | 10 |
2 files changed, 8 insertions, 14 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index de0bc8d3230..31480e32c16 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -2430,32 +2430,32 @@ drop table t1; CREATE TABLE t1 ( `a` int(11) NOT NULL auto_increment, `b` int(11) default NULL,PRIMARY KEY (`a`),UNIQUE KEY `b` (`b`)) ENGINE=innodb; insert into t1 (b) values (1); replace into t1 (b) values (2), (1), (3); -ERROR 23000: Duplicate entry '3' for key 1 select * from t1; a b -1 1 +3 1 +2 2 +4 3 truncate table t1; insert into t1 (b) values (1); replace into t1 (b) values (2); replace into t1 (b) values (1); replace into t1 (b) values (3); -ERROR 23000: Duplicate entry '3' for key 1 select * from t1; a b 3 1 2 2 +4 3 drop table t1; create table t1 (rowid int not null auto_increment, val int not null,primary key (rowid), unique(val)) engine=innodb; replace into t1 (val) values ('1'),('2'); replace into t1 (val) values ('1'),('2'); -ERROR 23000: Duplicate entry '3' for key 1 insert into t1 (val) values ('1'),('2'); ERROR 23000: Duplicate entry '1' for key 2 select * from t1; rowid val -1 1 -2 2 +3 1 +4 2 drop table t1; create table t1 (a int not null auto_increment primary key, val int) engine=InnoDB; insert into t1 (val) values (1); diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index e2d098618f5..7b27d589ec3 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -1350,16 +1350,12 @@ drop table t1; CREATE TABLE t1 ( `a` int(11) NOT NULL auto_increment, `b` int(11) default NULL,PRIMARY KEY (`a`),UNIQUE KEY `b` (`b`)) ENGINE=innodb; insert into t1 (b) values (1); -# We shouldn't get the following error ---error 1062 replace into t1 (b) values (2), (1), (3); select * from t1; truncate table t1; insert into t1 (b) values (1); replace into t1 (b) values (2); replace into t1 (b) values (1); -# We shouldn't get the following error ---error 1062 replace into t1 (b) values (3); select * from t1; drop table t1; @@ -1367,8 +1363,6 @@ drop table t1; create table t1 (rowid int not null auto_increment, val int not null,primary key (rowid), unique(val)) engine=innodb; replace into t1 (val) values ('1'),('2'); -# We shouldn't get the following error ---error 1062 replace into t1 (val) values ('1'),('2'); --error 1062 insert into t1 (val) values ('1'),('2'); @@ -1377,13 +1371,13 @@ drop table t1; # -# Test that update changes internal auto-increment value +# Test that update does not change internal auto-increment value # create table t1 (a int not null auto_increment primary key, val int) engine=InnoDB; insert into t1 (val) values (1); update t1 set a=2 where a=1; -# We shouldn't get the following error +# We should get the following error because InnoDB does not update the counter --error 1062 insert into t1 (val) values (1); select * from t1; |