bk commit into 5.0 tree (heikki:1.1930) BUG#11005

[Heikki Tuuri]

Below is the list of changes that have just been committed into a local
5.0 repository of heikki. When heikki does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1930 05/06/07 12:27:37 heikki@stripped +2 -0
  innodb.result, innodb.test:
    Update Monty's tests for AUTO-INC bug #11080 and bug #11005

  mysql-test/r/innodb.result
    1.116 05/06/07 12:27:17 heikki@stripped +11 -0
    Update Monty's tests for AUTO-INC bug #11080 and bug #11005

  mysql-test/t/innodb.test
    1.92 05/06/07 12:26:59 heikki@stripped +4 -9
    Update Monty's tests for AUTO-INC bug #11080 and bug #11005

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	heikki
# Host:	hundin.mysql.fi
# Root:	/home/heikki/mysql-5.0

--- 1.115/mysql-test/r/innodb.result	Tue Jun  7 05:43:54 2005
+++ 1.116/mysql-test/r/innodb.result	Tue Jun  7 12:27:17 2005
@@ -2457,6 +2457,17 @@
 1	1
 2	2
 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');
+insert into t1 (val) values ('1'),('2');
+ERROR 23000: Duplicate entry '1' for key 2
+select * from t1;
+rowid	val
+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);
 update t1 set a=2 where a=1;

--- 1.91/mysql-test/t/innodb.test	Tue Jun  7 00:31:47 2005
+++ 1.92/mysql-test/t/innodb.test	Tue Jun  7 12:26:59 2005
@@ -1350,16 +1350,12 @@
 
 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,24 +1363,23 @@
 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');
+--error 1062
 select * from t1;
 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);
+--error 1062
 select * from t1;
 drop table t1;