summaryrefslogtreecommitdiff
path: root/sql/ha_myisam.cc
diff options
context:
space:
mode:
authorunknown <brian@zim.tangent.org>2006-02-11 17:21:01 -0800
committerunknown <brian@zim.tangent.org>2006-02-11 17:21:01 -0800
commit88aa9b13102aa2d2676128b66caf532720cb8e8a (patch)
tree8069e98b4aaa0d9c03ec34489469209399a885eb /sql/ha_myisam.cc
parent0dc95fd02384b8e022953d3a66a025f016914eec (diff)
downloadmariadb-git-88aa9b13102aa2d2676128b66caf532720cb8e8a.tar.gz
This patch is to further remove the RAID code. We removed support for people creating tables with RAID. This patch remove most of the source for this.
sql/ha_myisam.cc: Remove RAID code sql/ha_partition.cc: Remove RAID code. sql/handler.h: Remove RAID code sql/lex.h: Remove RAID code. sql/mysqld.cc: Remove RAID code. sql/set_var.cc: Remove RAID code. sql/sql_show.cc: Remove RAID code sql/sql_yacc.yy: Remove more of the RAID code sql/table.cc: Remove RAID code.
Diffstat (limited to 'sql/ha_myisam.cc')
-rw-r--r--sql/ha_myisam.cc18
1 files changed, 0 insertions, 18 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 87bc2148b03..6445dbaa3f5 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -1353,10 +1353,6 @@ void ha_myisam::info(uint flag)
if (share->tmp_table == NO_TMP_TABLE)
pthread_mutex_unlock(&share->mutex);
- raid_type= info.raid_type;
- raid_chunks= info.raid_chunks;
- raid_chunksize= info.raid_chunksize;
-
/*
Set data_file_name and index_file_name to point at the symlink value
if table is symlinked (Ie; Real name is not same as generated name)
@@ -1433,12 +1429,6 @@ void ha_myisam::update_create_info(HA_CREATE_INFO *create_info)
{
create_info->auto_increment_value=auto_increment_value;
}
- if (!(create_info->used_fields & HA_CREATE_USED_RAID))
- {
- create_info->raid_type= raid_type;
- create_info->raid_chunks= raid_chunks;
- create_info->raid_chunksize= raid_chunksize;
- }
create_info->data_file_name=data_file_name;
create_info->index_file_name=index_file_name;
}
@@ -1630,11 +1620,6 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
(ulonglong) 0);
create_info.data_file_length= ((ulonglong) share->max_rows *
share->avg_row_length);
- create_info.raid_type=info->raid_type;
- create_info.raid_chunks= (info->raid_chunks ? info->raid_chunks :
- RAID_DEFAULT_CHUNKS);
- create_info.raid_chunksize= (info->raid_chunksize ? info->raid_chunksize :
- RAID_DEFAULT_CHUNKSIZE);
create_info.data_file_name= info->data_file_name;
create_info.index_file_name= info->index_file_name;
@@ -1759,9 +1744,6 @@ bool ha_myisam::check_if_incompatible_data(HA_CREATE_INFO *info,
uint options= table->s->db_options_in_use;
if (info->auto_increment_value != auto_increment_value ||
- info->raid_type != raid_type ||
- info->raid_chunks != raid_chunks ||
- info->raid_chunksize != raid_chunksize ||
info->data_file_name != data_file_name ||
info->index_file_name != index_file_name ||
table_changes == IS_EQUAL_NO)