merged

BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-ft_search.c~c011cb6e8041bb59:
  the file is deleted anyway
include/my_global.h:
  merder
myisam/ft_boolean_search.c:
  huh?
mysql-test/r/fulltext.result:
  use local
mysql-test/r/fulltext_cache.result:
  ur
mysql-test/r/fulltext_left_join.result:
  ur
mysql-test/r/fulltext_multi.result:
  ur
mysql-test/r/fulltext_order_by.result:
  ur

1 files changed, 47 insertions, 12 deletions

diff --git a/mysql-test/r/auto_increment.result b/mysql-test/r/auto_increment.result
index bf6265e5b64..66efd2ba567 100644
--- a/mysql-test/r/auto_increment.result
+++ b/mysql-test/r/auto_increment.result
@@ -1,32 +1,52 @@
+drop table if exists t1;
+create table t1 (a int not null auto_increment,b int, primary key (a)) type=myisam auto_increment=3;
+insert into t1 values (1,1),(NULL,3),(NULL,4);
+delete from t1 where a=4;
+insert into t1 values (NULL,5),(NULL,6);
+select * from t1;
 a	b
 1	1
 3	3
 5	5
 6	6
+delete from t1 where a=6;
+replace t1 values (3,1);
+ALTER TABLE t1 add c int;
+replace t1 values (3,3,3);
+insert into t1 values (NULL,7,7);
+update t1 set a=8,b=b+1,c=c+1 where a=7;
+insert into t1 values (NULL,9,9);
+select * from t1;
 a	b	c
 1	1	NULL
 3	3	3
 5	5	NULL
 8	8	8
 9	9	9
-a	b
-1	1
-5	5
-3	3
-4	4
-6	6
-a	b	c
-1	1	NULL
-5	5	NULL
-3	3	NULL
-4	4	NULL
-6	6	6
+drop table t1;
+create table t1 (
+skey tinyint unsigned NOT NULL auto_increment PRIMARY KEY,
+sval char(20)
+);
+insert into t1 values (NULL, "hello");
+insert into t1 values (NULL, "hey");
+select * from t1;
 skey	sval
 1	hello
 2	hey
+select _rowid,t1._rowid,skey,sval from t1;
 _rowid	_rowid	skey	sval
 1	1	1	hello
 2	2	2	hey
+drop table t1;
+create table t1 (a char(10) not null, b int not null auto_increment, primary key(a,b));
+insert into t1 values ("a",1),("b",2),("a",2),("c",1);
+insert into t1 values ("a",NULL),("b",NULL),("c",NULL),("e",NULL);
+insert into t1 (a) values ("a"),("b"),("c"),("d");
+insert into t1 (a) values ('k'),('d');
+insert into t1 (a) values ("a");
+insert into t1 values ("d",last_insert_id());
+select * from t1;
 a	b
 a	1
 a	2
@@ -44,9 +64,17 @@ d	2
 d	5
 e	1
 k	1
+drop table t1;
+create table t1 (ordid int(8) not null auto_increment, ord  varchar(50) not null, primary key (ordid), index(ord,ordid));
+insert into t1 (ordid,ord) values (NULL,'sdj'),(NULL,'sdj');
+select * from t1;
 ordid	ord
 1	sdj
 2	sdj
+drop table t1;
+create table t1 (ordid int(8) not null auto_increment, ord  varchar(50) not null, primary key (ord,ordid));
+insert into t1 values (NULL,'sdj'),(NULL,'sdj'),(NULL,"abc"),(NULL,'abc'),(NULL,'zzz'),(NULL,'sdj'),(NULL,'abc');
+select * from t1;
 ordid	ord
 1	abc
 2	abc
@@ -55,8 +83,15 @@ ordid	ord
 2	sdj
 3	sdj
 1	zzz
+drop table t1;
+create table t1 (a int not null primary key auto_increment);
+insert into t1 values (0);
+update t1 set a=0;
+select * from t1;
 a
 0
+check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	warning	Found row where the auto_increment column has the value 0
 test.t1	check	status	OK
+drop table t1;