1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal:/home/bk/mysql-5.1-maint

Browse Source 
into  shellback.(none):/home/msvensson/mysql/my51-bug30843
This commit is contained in:
unknown 2007-09-21 17:36:41 +02:00
commit cce60c643a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/archive.result
View File

@ -11125,9 +11125,10 @@ SELECT COUNT(auto) FROM t2;
COUNT(auto) COUNT(auto)
1213 1213
INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); 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; SELECT COUNT(auto) FROM t2;
COUNT(auto) COUNT(auto)
1214 1215
ALTER TABLE t2 DROP COLUMN fld6; ALTER TABLE t2 DROP COLUMN fld6;
SHOW CREATE TABLE t2; SHOW CREATE TABLE t2;
Table Create Table Table Create Table
@ -12355,6 +12356,7 @@ auto fld1 companynr fld3 fld4 fld5
3 011402 37 Romans scholastics jarring 3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily 4 011403 37 intercepted audiology tinily
4 011403 37 intercepted audiology tinily 4 011403 37 intercepted audiology tinily
5 000001 00 after delayed insert
CREATE TABLE `t5` ( CREATE TABLE `t5` (
`a` int(11) NOT NULL auto_increment, `a` int(11) NOT NULL auto_increment,
b char(12), b char(12),

10
mysql-test/t/archive.test
View File

@ -1352,7 +1352,15 @@ SELECT * FROM t2;
# Test INSERT DELAYED and wait until the table has one more record # Test INSERT DELAYED and wait until the table has one more record
SELECT COUNT(auto) FROM t2; SELECT COUNT(auto) FROM t2;
INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); 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; sleep 0.1;
} }