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

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


mysql-test/r/archive.result:
  Merge 5.0->5.1
mysql-test/t/archive.test:
  Merge 5.0->5.1

1 files changed, 3 insertions, 3 deletions

diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test
index 641770062ef..e0a2e877af5 100644
--- a/mysql-test/t/archive.test
+++ b/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