Merge bk-internal.mysql.com:/data0/bk/mysql-5.1

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


mysql-test/r/archive.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged

1 files changed, 7 insertions, 4 deletions

diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test
index 7eaf12de358..37542c272a9 100644
--- a/mysql-test/t/archive.test
+++ b/mysql-test/t/archive.test
@@ -1347,11 +1347,14 @@ CHECK TABLE t2;
 SELECT * FROM t2;
 
 
-# We won't know exactly about what is going on internally,
-# but we will see if the row makes it in!!
+# 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','');
-FLUSH TABLE t2;
-SELECT * FROM t2;
+while (`SELECT COUNT(auto)!=1214 FROM t2`)
+{
+  sleep 0.1;
+}
+SELECT COUNT(auto) FROM t2;
 
 # Adding test for alter table
 ALTER TABLE t2 DROP COLUMN fld6;