diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:56:01 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:56:01 +0200 |
| commit | 0e29519b2b4f06f2e37b59c7e9359331c15e83a4 (patch) | |
| tree | 922f8cbd12ff26fed829ed3fbe11e44e2ea2923f /mysql-test/r/archive.result | |
| parent | 49b448ae5a91ed9c0dde57ecd1de724bf517d904 (diff) | |
| parent | 78f89a729a962f7a88869a3d5e50ca493391b2a4 (diff) | |
| download | mariadb-git-0e29519b2b4f06f2e37b59c7e9359331c15e83a4.tar.gz | |
Merge from 4.1 to 5.0
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
BUILD/SETUP.sh:
Manual merge of conflicts
-DBIG_TABLES removed set by configure using --with-big-tables
configure.in:
manual merge
mysql-test/r/archive.result:
Manual merge
mysql-test/t/archive.test:
Manual merge
Diffstat (limited to 'mysql-test/r/archive.result')
| -rw-r--r-- | mysql-test/r/archive.result | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index ce5917db4bc..c05f7a60e99 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -5020,4 +5020,18 @@ auto fld1 companynr fld3 fld4 fld5 fld6 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; +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 +drop table t1, t2, t4; |