diff options
| author | unknown <brian@zim.tangent.org> | 2006-02-11 17:26:32 -0800 |
|---|---|---|
| committer | unknown <brian@zim.tangent.org> | 2006-02-11 17:26:32 -0800 |
| commit | dc11d498b25d6b2fd909b344f3f2837571cb38b0 (patch) | |
| tree | 1e483de698a9543c4360218d2bc09927fb27671a /sql/handler.h | |
| parent | d49527b6099c71b2973daf188b43b33feefc7c7d (diff) | |
| parent | 88aa9b13102aa2d2676128b66caf532720cb8e8a (diff) | |
| download | mariadb-git-dc11d498b25d6b2fd909b344f3f2837571cb38b0.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.tangent.org:/home/brian/raid/mysql-5.1-new
sql/ha_myisam.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/handler.h b/sql/handler.h index 92fa581c19c..a8804bdba17 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -266,7 +266,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) @@ -1068,14 +1068,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 */ @@ -1204,7 +1202,6 @@ public: 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; @@ -1228,7 +1225,6 @@ public: /* 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; @@ -1245,7 +1241,7 @@ public: 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) |