diff options
author | pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se <> | 2006-03-22 00:17:22 -0500 |
---|---|---|
committer | pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se <> | 2006-03-22 00:17:22 -0500 |
commit | 05105a02cc690e0c6c68f583fc5b77721fcb9878 (patch) | |
tree | 8005e77488f8d5fa6d32f59afdb313d55ec1d677 /sql/partition_element.h | |
parent | 3dc4635c70118c02c9d392db481b1d6c5fb86f4a (diff) | |
download | mariadb-git-05105a02cc690e0c6c68f583fc5b77721fcb9878.tar.gz |
manual merge
Diffstat (limited to 'sql/partition_element.h')
-rw-r--r-- | sql/partition_element.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/partition_element.h b/sql/partition_element.h index d20715d2408..f822f266d4c 100644 --- a/sql/partition_element.h +++ b/sql/partition_element.h @@ -36,6 +36,8 @@ enum partition_state { PART_IS_ADDED= 8 }; +struct st_table_log_memory_entry; + class partition_element :public Sql_alloc { public: List<partition_element> subpartitions; @@ -44,6 +46,7 @@ public: ulonglong part_min_rows; char *partition_name; char *tablespace_name; + struct st_table_log_memory_entry *log_entry; longlong range_value; char* part_comment; char* data_file_name; @@ -55,7 +58,8 @@ public: partition_element() : part_max_rows(0), part_min_rows(0), partition_name(NULL), - tablespace_name(NULL), range_value(0), part_comment(NULL), + tablespace_name(NULL), log_entry(NULL), + range_value(0), part_comment(NULL), data_file_name(NULL), index_file_name(NULL), engine_type(NULL),part_state(PART_NORMAL), nodegroup_id(UNDEF_NODEGROUP), has_null_value(FALSE) |