bk commit into 5.0 tree (msvensson:1.2353)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-11 16:43:21+01:00, msvensson@neptunus.(none) +2 -0
  Wait for INSERT DELAYED to finish i.e sleep in while loop until
  "select count" is one more.

  mysql-test/r/archive.result@stripped, 2006-12-11 16:43:18+01:00, msvensson@neptunus.(none) +6 -0
    Wait for INSERT DELAYED to finish i.e sleep in while loop until
    "select count" is one more.

  mysql-test/t/archive.test@stripped, 2006-12-11 16:43:18+01:00, msvensson@neptunus.(none) +7 -3
    Wait for INSERT DELAYED to finish i.e sleep in while loop until
    "select count" is one more.

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.15/mysql-test/r/archive.result	2006-12-11 16:43:28 +01:00
+++ 1.16/mysql-test/r/archive.result	2006-12-11 16:43:28 +01:00
@@ -11120,7 +11120,13 @@ auto	fld1	companynr	fld3	fld4	fld5	fld6
 2	011401	37	breaking	dreaded	Steinberg	W
 3	011402	37	Romans	scholastics	jarring	
 4	011403	37	intercepted	audiology	tinily	
+SELECT COUNT(auto) FROM t2;
+COUNT(auto)
+1213
 INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
+SELECT COUNT(auto) FROM t2;
+COUNT(auto)
+1214
 ALTER TABLE t2 DROP COLUMN fld6;
 SHOW CREATE TABLE t2;
 Table	Create Table

--- 1.16/mysql-test/t/archive.test	2006-12-11 16:43:28 +01:00
+++ 1.17/mysql-test/t/archive.test	2006-12-11 16:43:28 +01:00
@@ -1345,10 +1345,14 @@ SELECT * FROM t2;
 CHECK TABLE t2;
 SELECT * FROM t2;
 
-
-# Just test syntax, we will never know if the output is right or wrong
-# Must be the last test
+# 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`)
+{
+  sleep 0.1;
+}
+SELECT COUNT(auto) FROM t2;
 
 # Adding test for alter table
 ALTER TABLE t2 DROP COLUMN fld6;