diff options
| author | unknown <brian@zim.(none)> | 2005-08-30 11:04:23 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-08-30 11:04:23 -0700 |
| commit | 22fffaf8ff7e02498923852b9c33dd3cbb79aa3b (patch) | |
| tree | e8a68db99975a5b74d24d0eba60b2f8a5ecd7c29 /mysql-test/r/archive.result | |
| parent | 463f46c810d14b16a6cfa07928c1393eee42a86c (diff) | |
| download | mariadb-git-22fffaf8ff7e02498923852b9c33dd3cbb79aa3b.tar.gz | |
Fix for bad merge.
mysql-test/r/archive.result:
Updated result file
mysql-test/t/archive.test:
Test fix. The INSERT DELAYED test must always come last.
sql/examples/ha_archive.h:
Bad merge.
Diffstat (limited to 'mysql-test/r/archive.result')
| -rw-r--r-- | mysql-test/r/archive.result | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index f4c98d01fe0..075f0f716d2 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -6255,35 +6255,6 @@ 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 -INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); -create table t3 engine=archive select * from t2; -select * from t3 where fld3='bonfire'; -auto fld1 companynr fld3 fld4 fld5 fld6 -1191 068504 00 bonfire corresponds positively -select count(*) from t3; -count(*) -1203 -rename table t3 to t4; -select * from t4 where fld3='bonfire'; -auto fld1 companynr fld3 fld4 fld5 fld6 -1191 068504 00 bonfire corresponds positively -select count(*) from t4; -count(*) -1203 -create table t3 engine=archive select * from t2; -select * from t3 where fld3='bonfire'; -auto fld1 companynr fld3 fld4 fld5 fld6 -1191 068504 00 bonfire corresponds positively -select count(*) from t3; -count(*) -1203 -rename table t3 to t4; -select * from t4 where fld3='bonfire'; -auto fld1 companynr fld3 fld4 fld5 fld6 -1191 068504 00 bonfire corresponds positively -select count(*) from t4; -count(*) -1203 DELETE FROM t2; SELECT * FROM t2; auto fld1 companynr fld3 fld4 fld5 fld6 @@ -7490,6 +7461,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 +2 011401 37 breaking dreaded Steinberg W +3 011402 37 Romans scholastics jarring +4 011403 37 intercepted audiology tinily +1 000001 00 Omaha teethe neat +2 011401 37 breaking dreaded Steinberg W +3 011402 37 Romans scholastics jarring +4 011403 37 intercepted audiology tinily INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W'); INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring',''); INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); @@ -8701,6 +8679,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 +1 000001 00 Omaha teethe neat +2 011401 37 breaking dreaded Steinberg W +3 011402 37 Romans scholastics jarring +4 011403 37 intercepted audiology tinily +2 011401 37 breaking dreaded Steinberg W +3 011402 37 Romans scholastics jarring +4 011403 37 intercepted audiology tinily TRUNCATE TABLE t2; SELECT * FROM t2; auto fld1 companynr fld3 fld4 fld5 fld6 @@ -9910,4 +9895,12 @@ 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 +1 000001 00 Omaha teethe neat +2 011401 37 breaking dreaded Steinberg W +3 011402 37 Romans scholastics jarring +4 011403 37 intercepted audiology tinily +2 011401 37 breaking dreaded Steinberg W +3 011402 37 Romans scholastics jarring +4 011403 37 intercepted audiology tinily +INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); drop table t1, t2, t4; |