bk commit into 3.23 tree

[sasha]

Below is the list of changes that have just been commited into a local
3.23. repository of sasha. When sasha does a push, they will be
propogaged to the main repository and within 24 hours after the push into
the public repository. For information on how to access
the public repository see
http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-08-24 20:45:06-06:00, sasha@stripped
  test case for InnoDB replace/auto_increment bug when insert_id is 
  forced by the user

  mysql-test/r/innodb.result
    1.13 01/08/24 20:44:34 sasha@stripped +4 -0
    updated result

  mysql-test/t/innodb.test
    1.14 01/08/24 20:44:34 sasha@stripped +22 -0
    added test case for bug in Innodb reported by Slashdot

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-max

--- 1.12/mysql-test/r/innodb.result	Fri Aug 10 10:02:23 2001
+++ 1.13/mysql-test/r/innodb.result	Fri Aug 24 20:44:34 2001
@@ -475,3 +475,7 @@
 1
 2
 4
+id	name	value	uid
+1	one	one value	101
+3	three	three value	103
+6	two	other value	102

--- 1.13/mysql-test/t/innodb.test	Tue Aug 21 11:05:59 2001
+++ 1.14/mysql-test/t/innodb.test	Fri Aug 24 20:44:34 2001
@@ -490,3 +490,25 @@
 insert into t1 values (NULL);
 select * from t1;
 drop table t1;
+
+#Slashdot bug
+create table t1
+ (
+  id int auto_increment primary key,
+  name varchar(32) not null,
+  value text not null,
+  uid int not null,
+  unique key(name,uid)
+ ) type=innodb;
+insert into t1 values (1,'one','one value',101),
+ (2,'two','two value',102),(3,'three','three value',103);
+set insert_id=5;
+replace into t1 (value,name,uid) values ('other value','two',102);
+delete from t1 where uid=102;
+set insert_id=5;
+replace into t1 (value,name,uid) values ('other value','two',102);
+set insert_id=6;
+replace into t1 (value,name,uid) values ('other value','two',102);
+select * from t1;
+drop table t1;
+