diff options
| author | brian@zim.(none) <> | 2005-08-30 11:04:23 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2005-08-30 11:04:23 -0700 |
| commit | bd806f786ea17f197cc8899f36758666e33dfe3f (patch) | |
| tree | e8a68db99975a5b74d24d0eba60b2f8a5ecd7c29 /mysql-test | |
| parent | 3091eb3fa44f304d9ac48c1a9f8e3296b3d9adfc (diff) | |
| download | mariadb-git-bd806f786ea17f197cc8899f36758666e33dfe3f.tar.gz | |
Fix for bad merge.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/archive.result | 51 | ||||
| -rw-r--r-- | mysql-test/t/archive.test | 19 |
2 files changed, 32 insertions, 38 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; diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test index 3aef9b27c0d..4318525fe43 100644 --- a/mysql-test/t/archive.test +++ b/mysql-test/t/archive.test @@ -1302,6 +1302,7 @@ rename table t3 to t4; select * from t4 where fld3='bonfire'; select count(*) from t4; +# End of 4.1 tests # # Test for insert after select @@ -1326,15 +1327,6 @@ SELECT * FROM t2; INSERT INTO t2 VALUES (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',''); SELECT * FROM t2; -# Just test syntax, we will never know if the out put is right or wrong -# Must be the last test -INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); -# -# Cleanup, test is over -# - -# End of 4.1 tests - # # For bug #12836 # Delete was allowing all rows to be removed @@ -1347,4 +1339,13 @@ SELECT * FROM t2; TRUNCATE TABLE t2; SELECT * FROM t2; + +# Just test syntax, we will never know if the out put is right or wrong +# Must be the last test +INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); +# +# Cleanup, test is over +# + + drop table t1, t2, t4; |