diff options
| author | unknown <msvensson@shellback.(none)> | 2007-09-21 10:51:23 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2007-09-21 10:51:23 +0200 |
| commit | 7d3e69f4141cf591694a124ba8df5f9b5a23b6da (patch) | |
| tree | 8115ae358b4aa382fb20a361bddba2d600782927 /mysql-test/r/archive.result | |
| parent | 943ed8fe354734fa52417bf36920462ab23756d3 (diff) | |
| parent | 8a42112692cb08e55465090311e4b51c7decf283 (diff) | |
| download | mariadb-git-7d3e69f4141cf591694a124ba8df5f9b5a23b6da.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into shellback.(none):/home/msvensson/mysql/my51-bug30843
mysql-test/t/archive.test:
Auto merged
mysql-test/r/archive.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/archive.result')
| -rw-r--r-- | mysql-test/r/archive.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index 36b013703d8..87c65e08190 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -11125,9 +11125,10 @@ 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',''); SELECT COUNT(auto) FROM t2; COUNT(auto) -1214 +1215 ALTER TABLE t2 DROP COLUMN fld6; SHOW CREATE TABLE t2; Table Create Table @@ -12355,6 +12356,7 @@ auto fld1 companynr fld3 fld4 fld5 3 011402 37 Romans scholastics jarring 4 011403 37 intercepted audiology tinily 4 011403 37 intercepted audiology tinily +5 000001 00 after delayed insert CREATE TABLE `t5` ( `a` int(11) NOT NULL auto_increment, b char(12), |