Merge bk-internal:/home/bk/mysql-5.1-maint

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

mysql-test/r/archive.result

@@ -11125,9 +11125,10 @@ 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','');
 SELECT COUNT(auto) FROM t2;
 COUNT(auto)
-1214
+1215
 ALTER TABLE t2 DROP COLUMN fld6;
 SHOW CREATE TABLE t2;
 Table	Create Table
@@ -12355,6 +12356,7 @@ auto	fld1	companynr	fld3	fld4	fld5
 3	011402	37	Romans	scholastics	jarring
 4	011403	37	intercepted	audiology	tinily
 4	011403	37	intercepted	audiology	tinily
+5	000001	00	after	delayed	insert
 CREATE TABLE `t5` (
 `a` int(11) NOT NULL auto_increment,
 b char(12),

mysql-test/t/archive.test

@@ -1352,7 +1352,15 @@ 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','');
-while (`SELECT COUNT(auto)!=1214 FROM t2`)
+
+# 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','');
+
+# Wait for the delayed insert to appear
+while (`SELECT COUNT(auto)!=1215 FROM t2`)
 {
   sleep 0.1;
 }