diff options
| author | unknown <brian@zim.(none)> | 2006-02-24 13:20:51 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-02-24 13:20:51 -0800 |
| commit | 868cc7fd4405332858dae6e975fbab21be75be5b (patch) | |
| tree | 9f5fa93232e8bbaf2680ef79d6dc936c4b0fe220 /storage/myisam | |
| parent | 263abaebbe77354ff65a0860d9f1828f64b03386 (diff) | |
| download | mariadb-git-868cc7fd4405332858dae6e975fbab21be75be5b.tar.gz | |
This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.
BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6:
Delete: include/raid.h
BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1:
Delete: mysys/raid.cc
BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c:
Delete: mysys/raid2.c
include/Makefile.am:
Removing raid
include/my_sys.h:
Removing Raid
include/myisam.h:
Removing raid
mysql-test/r/case.result:
Cleaned up incomming tables
mysql-test/r/mysqlcheck.result:
new results
mysql-test/t/case.test:
Cleaned up test
mysql-test/t/mysqlcheck.test:
Cleaned up two tests.
mysys/Makefile.am:
Removed raid
mysys/my_static.c:
Removed raid
storage/myisam/mi_check.c:
Removed raid
storage/myisam/mi_info.c:
Removed raid bits.
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_check.c | 3 | ||||
| -rw-r--r-- | storage/myisam/mi_info.c | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index 9ce1dff51af..eb2f42697ce 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -3900,9 +3900,6 @@ int recreate_table(MI_CHECK *param, MI_INFO **org_info, char *filename) create_info.data_file_length=file_length; create_info.auto_increment=share.state.auto_increment; - create_info.raid_type= share.base.raid_type; - create_info.raid_chunks= share.base.raid_chunks; - create_info.raid_chunksize= share.base.raid_chunksize; create_info.language = (param->language ? param->language : share.state.header.language); create_info.key_file_length= status_info.key_file_length; diff --git a/storage/myisam/mi_info.c b/storage/myisam/mi_info.c index bdece9c2ee3..ebe59d82f0e 100644 --- a/storage/myisam/mi_info.c +++ b/storage/myisam/mi_info.c @@ -85,13 +85,6 @@ int mi_status(MI_INFO *info, register MI_ISAMINFO *x, uint flag) x->key_map = share->state.key_map; x->data_file_name = share->data_file_name; x->index_file_name = share->index_file_name; - /* - The following should be included even if we are not compiling with - USE_RAID as the client must be able to request it! - */ - x->raid_type= share->base.raid_type; - x->raid_chunks= share->base.raid_chunks; - x->raid_chunksize= share->base.raid_chunksize; } if ((flag & HA_STATUS_TIME) && !my_fstat(info->dfile,&state,MYF(0))) x->update_time=state.st_mtime; |