Commit 88aa9b13 authored by unknown's avatar unknown
Browse files

This patch is to further remove the RAID code. We removed support for people... 

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.
parent 0dc95fd0

sql/ha_myisam.cc

+0 −18
Original line number Diff line number Diff line
@@ -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)

sql/ha_partition.cc

+0 −6
Original line number Diff line number Diff line
@@ -2392,9 +2392,6 @@ void ha_partition::info(uint flag) 
      sortkey:                  Never used at any place so ignored

      ref_length:               We set this to the value calculated

      and stored in local object

      raid_type:                Set by first handler (MyISAM)

      raid_chunks:              Set by first handler (MyISAM)

      raid_chunksize:           Set by first handler (MyISAM)

      create_time:              Creation time of table

      Set by first handler
@@ -2405,9 +2402,6 @@ void ha_partition::info(uint flag) 
    file= m_file[0];

    file->info(HA_STATUS_CONST);

    create_time= file->create_time;

    raid_type= file->raid_type;

    raid_chunks= file->raid_chunks;

    raid_chunksize= file->raid_chunksize;

    ref_length= m_ref_length;

  }

  if (flag & HA_STATUS_ERRKEY)

sql/handler.h

+2 −6
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ enum enum_binlog_command { 


/* Bits in used_fields */

#define HA_CREATE_USED_AUTO             (1L << 0)

#define HA_CREATE_USED_RAID             (1L << 1)

#define HA_CREATE_USED_RAID             (1L << 1) //RAID is no longer availble

#define HA_CREATE_USED_UNION            (1L << 2)

#define HA_CREATE_USED_INSERT_METHOD    (1L << 3)

#define HA_CREATE_USED_MIN_ROWS         (1L << 4)
@@ -855,14 +855,12 @@ typedef struct st_ha_create_information 
  ulonglong auto_increment_value;

  ulong table_options;

  ulong avg_row_length;

  ulong raid_chunksize;

  ulong used_fields;

  SQL_LIST merge_list;

  handlerton *db_type;

  enum row_type row_type;

  uint null_bits;                       /* NULL bits at start of record */

  uint options;				/* OR of HA_CREATE_ options */

  uint raid_type,raid_chunks;

  uint merge_insert_method;

  uint extra_size;                      /* length of extra data segment */

  bool table_existed;			/* 1 in create if table existed */
@@ -982,7 +980,6 @@ class handler :public Sql_alloc 
  ulonglong auto_increment_value;

  ha_rows records;			/* Records in table */

  ha_rows deleted;			/* Deleted records */

  ulong raid_chunksize;

  ulong mean_rec_length;		/* physical reclength */

  time_t create_time;			/* When table was created */

  time_t check_time;
@@ -1006,7 +1003,6 @@ class handler :public Sql_alloc 
  /* Length of ref (1-8 or the clustered key length) */

  uint ref_length;

  uint block_size;			/* index block size */

  uint raid_type,raid_chunks;

  FT_INFO *ft_handler;

  enum {NONE=0, INDEX, RND} inited;

  bool  auto_increment_column_changed;
@@ -1023,7 +1019,7 @@ class handler :public Sql_alloc 
    create_time(0), check_time(0), update_time(0),

    key_used_on_scan(MAX_KEY), active_index(MAX_KEY),

    ref_length(sizeof(my_off_t)), block_size(0),

    raid_type(0), ft_handler(0), inited(NONE), implicit_emptied(0),

    ft_handler(0), inited(NONE), implicit_emptied(0),

    pushed_cond(NULL)

    {}

  virtual ~handler(void)

sql/lex.h

+0 −5
Original line number Diff line number Diff line
@@ -412,10 +412,6 @@ static SYMBOL symbols[] = { 
  { "QUARTER",          SYM(QUARTER_SYM)},

  { "QUERY",		SYM(QUERY_SYM)},

  { "QUICK",	        SYM(QUICK)},

  { "RAID0",		SYM(RAID_0_SYM)},

  { "RAID_CHUNKS",	SYM(RAID_CHUNKS)},

  { "RAID_CHUNKSIZE",	SYM(RAID_CHUNKSIZE)},

  { "RAID_TYPE",	SYM(RAID_TYPE)},

  { "RANGE",            SYM(RANGE_SYM)},

  { "READ",		SYM(READ_SYM)},

  { "READ_ONLY",	SYM(READ_ONLY_SYM)},
@@ -513,7 +509,6 @@ static SYMBOL symbols[] = { 
  { "STORAGE",		SYM(STORAGE_SYM)},

  { "STRAIGHT_JOIN",	SYM(STRAIGHT_JOIN)},

  { "STRING",		SYM(STRING_SYM)},

  { "STRIPED",		SYM(RAID_STRIPED_SYM)},

  { "SUBJECT",		SYM(SUBJECT_SYM)},

  { "SUBPARTITION",     SYM(SUBPARTITION_SYM)},

  { "SUBPARTITIONS",    SYM(SUBPARTITIONS_SYM)},

sql/mysqld.cc

+1 −9
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ CHARSET_INFO *system_charset_info, *files_charset_info ; 
CHARSET_INFO *national_charset_info, *table_alias_charset;



SHOW_COMP_OPTION have_row_based_replication;

SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_query_cache;

SHOW_COMP_OPTION have_openssl, have_symlink, have_query_cache;

SHOW_COMP_OPTION have_geometry, have_rtree_keys;

SHOW_COMP_OPTION have_crypt, have_compress;
@@ -1179,9 +1179,6 @@ void clean_up(bool print_message) 
  multi_keycache_free();

  free_status_vars();

  end_thr_alarm(1);			/* Free allocated memory */

#ifdef USE_RAID

  end_raid();

#endif

  my_free_open_file_info();

  my_free((char*) global_system_variables.date_format,

	  MYF(MY_ALLOW_ZERO_PTR));
@@ -7011,11 +7008,6 @@ static void mysql_init_variables(void) 
#else

  have_ndbcluster=SHOW_OPTION_NO;

#endif

#ifdef USE_RAID

  have_raid=SHOW_OPTION_YES;

#else

  have_raid=SHOW_OPTION_NO;

#endif

#ifdef HAVE_OPENSSL

  have_openssl=SHOW_OPTION_YES;

#else