Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  shellback.(none):/home/msvensson/mysql/my51-bug30843

mysql-test/r/archive.result

@@ -11124,8 +11124,8 @@ auto	fld1	companynr	fld3	fld4	fld5	fld6
 SELECT COUNT(auto) FROM t2;
 COUNT(auto)
 1213
-INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
-INSERT INTO t2 VALUES (5,000001,00,'after','delayed','insert','');
+INSERT DELAYED INTO t2 VALUES (99999,011403,37,'the','delayed','insert','');
+INSERT INTO t2 VALUES (100000,000001,00,'after','delayed','insert','');
 SELECT COUNT(auto) FROM t2;
 COUNT(auto)
 1215
@@ -11140,7 +11140,7 @@ t2	CREATE TABLE `t2` (
   `fld4` char(35) NOT NULL DEFAULT '',
   `fld5` char(35) NOT NULL DEFAULT ''
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-SELECT * FROM t2;
+SELECT * FROM t2 WHERE auto != 100000;
 auto	fld1	companynr	fld3	fld4	fld5
 1	000001	00	Omaha	teethe	neat
 2	011401	37	breaking	dreaded	Steinberg
@@ -12355,8 +12355,7 @@ auto	fld1	companynr	fld3	fld4	fld5
 2	011401	37	breaking	dreaded	Steinberg
 3	011402	37	Romans	scholastics	jarring
 4	011403	37	intercepted	audiology	tinily
-4	011403	37	intercepted	audiology	tinily
-5	000001	00	after	delayed	insert
+99999	011403	37	the	delayed	insert
 CREATE TABLE `t5` (
 `a` int(11) NOT NULL auto_increment,
 b char(12),

mysql-test/t/archive.test

@@ -1351,13 +1351,13 @@ SELECT * FROM t2;
 
 # Test INSERT DELAYED and wait until the table has one more record
 SELECT COUNT(auto) FROM t2;
-INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
+INSERT DELAYED INTO t2 VALUES (99999,011403,37,'the','delayed','insert','');
 
 # Insert another record since in Archive delayed values are only
 # guaranteed to materialize based on either:
 # 1) A new row showing up from a normal insert
 # 2) A flush table  has occurred.
-INSERT INTO t2 VALUES (5,000001,00,'after','delayed','insert','');
+INSERT INTO t2 VALUES (100000,000001,00,'after','delayed','insert','');
 
 # Wait for the delayed insert to appear
 while (`SELECT COUNT(auto)!=1215 FROM t2`)
@@ -1369,7 +1369,7 @@ SELECT COUNT(auto) FROM t2;
 # Adding test for ALTER TABLE
 ALTER TABLE t2 DROP COLUMN fld6; 
 SHOW CREATE TABLE t2;
-SELECT * FROM t2;
+SELECT * FROM t2 WHERE auto != 100000;
 
 
 # Adding tests for autoincrement