diff options
| author | unknown <msvensson@shellback.(none)> | 2007-09-22 12:19:49 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2007-09-22 12:19:49 +0200 |
| commit | 37d6773a302e9babafc2aba38148daf750e06091 (patch) | |
| tree | f8c7d0382ee07159e43ccad4ec20d319704b378a | |
| parent | b1a33149a7cc44b02ebf4de76a5e85592d41a9ad (diff) | |
| parent | cfbb6fc63255dadb92af18546fa7ebe8d91aa870 (diff) | |
| download | mariadb-git-37d6773a302e9babafc2aba38148daf750e06091.tar.gz | |
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
| -rw-r--r-- | mysql-test/r/archive.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/archive.test | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index 87c65e08190..0a473a16771 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -11124,8 +11124,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 @@ -11140,7 +11140,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 @@ -12355,8 +12355,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 +99999 011403 37 the delayed insert CREATE TABLE `t5` ( `a` int(11) NOT NULL auto_increment, b char(12), 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 |