summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorunknown <mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-02-10 22:36:01 +0100
committerunknown <mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-02-10 22:36:01 +0100
commitc6d1dee7e3decd33735d593d23f0ff280655f016 (patch)
tree2fad389b4a12a77f2f448c174dfbd802191e3cf7 /sql/handler.h
parent8ae7ef461665ce121aeb13999f33797250875b2b (diff)
downloadmariadb-git-c6d1dee7e3decd33735d593d23f0ff280655f016.tar.gz
WL 2826: Error handling of ALTER TABLE for partitioning
Make lots of fixes to handle the most complex case of reorganising of partitions where two-phased processes are needed in some cases. sql/ha_partition.cc: Rewrote the rename partitions and drop partitions to align with how the table log handles things. sql/handler.h: Added new entry to partition_element to keep track of log entry for a partition during ALTER TABLE that reorganises existing partitions. sql/mysql_priv.h: Converted 'd', 'e' and so forth to constants with somewhat more descriptive names Added method to inactivate log entries sql/sql_partition.cc: Fix change of partitions sql/sql_table.cc: More constants with somewhat descriptive names Moved around some methods between internal part and external part Added new method to handle inactivation of log entries
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h
index 00bfaa77e91..b54e7ff129b 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -667,6 +667,7 @@ public:
ulonglong part_min_rows;
char *partition_name;
char *tablespace_name;
+ TABLE_LOG_MEMORY_ENTRY *log_entry;
longlong range_value;
char* part_comment;
char* data_file_name;
@@ -677,7 +678,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(0),
+ 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)