1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

manual merge

This commit is contained in:
unknown
2006-03-22 00:17:22 -05:00
parent 88a1cff6ef
commit 1c6f84f828
3 changed files with 14 additions and 5 deletions

View File

@ -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)