bk commit into 5.0 tree (msvensson:1.2529) 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-22 12:17:14+02:00, msvensson@shellback.(none) +2 -0
  Bug#30843  Bad Test addition to t/archive.test

  mysql-test/r/archive.result@stripped, 2007-09-22 12:17:09+02:00, msvensson@shellback.(none) +4 -5
    Don't care about the "after insert delayed" record when since
    we can't guarantee the order it's been inserted   

  mysql-test/t/archive.test@stripped, 2007-09-22 12:17:09+02:00, msvensson@shellback.(none) +3 -3
    Don't care about the "after insert delayed" record when since
    we can't guarantee the order it's been inserted   

diff -Nrup a/mysql-test/r/archive.result b/mysql-test/r/archive.result
--- a/mysql-test/r/archive.result	2007-09-21 09:48:27 +02:00
+++ b/mysql-test/r/archive.result	2007-09-22 12:17:09 +02:00
@@ -11123,8 +11123,8 @@ auto	fld1	companynr	fld3	fld4	fld5	fld6
 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','');
+INSERT DELAYED INTO t2 VALUES (99999,011403,37,'the','delayed','insert','');
+INSERT INTO t2 VALUES (100000,000001,00,'after','delayed','insert','');
 SELECT COUNT(auto) FROM t2;
 COUNT(auto)
 1215
@@ -11139,7 +11139,7 @@ t2	CREATE TABLE `t2` (
   `fld4` char(35) NOT NULL default '',
   `fld5` char(35) NOT NULL default ''
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-SELECT * from t2;
+SELECT * from t2 WHERE auto != 100000;
 auto	fld1	companynr	fld3	fld4	fld5
 1	000001	00	Omaha	teethe	neat
 2	011401	37	breaking	dreaded	Steinberg
@@ -12354,8 +12354,7 @@ auto	fld1	companynr	fld3	fld4	fld5
 2	011401	37	breaking	dreaded	Steinberg
 3	011402	37	Romans	scholastics	jarring
 4	011403	37	intercepted	audiology	tinily
-4	011403	37	intercepted	audiology	tinily
-5	000001	00	after	delayed	insert
[phone]	the	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-09-21 09:48:28 +02:00
+++ b/mysql-test/t/archive.test	2007-09-22 12:17:09 +02:00
@@ -1347,13 +1347,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`)
@@ -1365,7 +1365,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;
 # 
 # Cleanup, test is over
 #