bk commit into 5.0 tree (heikki:1.1932) 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.1932 05/06/07 12:32:39 heikki@stripped +1 -0
  innodb.result:
    Update Monty's tests for AUTO-INC bug #11080 and bug #11005

  mysql-test/r/innodb.result
    1.117 05/06/07 12:32:21 heikki@stripped +4 -15
    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.116/mysql-test/r/innodb.result	Tue Jun  7 12:27:17 2005
+++ 1.117/mysql-test/r/innodb.result	Tue Jun  7 12:32:21 2005
@@ -2430,32 +2430,21 @@
 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
-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
+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;