bk commit into 5.0 tree (msvensson:1.2496) BUG#30843

[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, 2007-09-21 09:48:30+02:00, msvensson@shellback.(none) +2 -0
  Bug#30843 Bad Test addition to t/archive.test
   - Add extra insert

  mysql-test/r/archive.result@stripped, 2007-09-21 09:48:27+02:00, msvensson@shellback.(none) +3 -1
    Add an extra insert to guarantee that the delayed
    insert shows up in the table 

  mysql-test/t/archive.test@stripped, 2007-09-21 09:48:28+02:00, msvensson@shellback.(none) +9 -1
    Add an extra insert to guarantee that the delayed
    insert shows up in the table 

diff -Nrup a/mysql-test/r/archive.result b/mysql-test/r/archive.result
--- a/mysql-test/r/archive.result	2007-06-27 10:19:32 +02:00
+++ b/mysql-test/r/archive.result	2007-09-21 09:48:27 +02:00
@@ -11124,9 +11124,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
@@ -12354,6 +12355,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
[phone]	after	delayed	insert
 drop table t1, t2, t4;
 create table t1 (i int) engine=archive;
 insert into t1 values (1);
diff -Nrup a/mysql-test/t/archive.test b/mysql-test/t/archive.test
--- a/mysql-test/t/archive.test	2007-06-27 10:19:32 +02:00
+++ b/mysql-test/t/archive.test	2007-09-21 09:48:28 +02:00
@@ -1348,7 +1348,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;
 }