database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-21 08:47:42 +03:00
Code Activity

Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint

Browse Source 
into  naruto.:C:/cpp/mysql-5.0-maint
This commit is contained in:
Kristofer.Pettersson@naruto.
2006-12-14 15:52:06 +01:00
parent b7b1aab081 74e3857b8d
commit aa2c208899
9 changed files with 114 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11120,7 +11120,13 @@ auto fld1 companynr fld3 fld4 fld5 fld6
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
SELECT COUNT(auto) FROM t2;
COUNT(auto)
1213
INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
SELECT COUNT(auto) FROM t2;
COUNT(auto)
1214
ALTER TABLE t2 DROP COLUMN fld6;
SHOW CREATE TABLE t2;
Table Create Table

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

@@ -1345,10 +1345,14 @@ SELECT * FROM t2;
CHECK TABLE t2;
SELECT * FROM t2;
# Just test syntax, we will never know if the output is right or wrong
# Must be the last test
# 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`)
{
sleep 0.1;
}
SELECT COUNT(auto) FROM t2;
# Adding test for alter table
ALTER TABLE t2 DROP COLUMN fld6;