summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorunknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-02-09 14:13:22 -0500
committerunknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-02-09 14:13:22 -0500
commitcd653ed9ec12bcd125a0852fb0c0a58f95b4c354 (patch)
tree441f4c06abd604e827d544c402cd4c1ae1a86170 /sql/handler.h
parentb037a7cad456b962aa87405a049a744f1d8b8ee7 (diff)
downloadmariadb-git-cd653ed9ec12bcd125a0852fb0c0a58f95b4c354.tar.gz
WL 2826: Error handling of ALTER TABLE for partitioning
A number of fixes sql/handler.h: A numbre of fixes sql/mysql_priv.h: A numbre of fixes sql/share/errmsg.txt: A numbre of fixes sql/sql_partition.cc: A numbre of fixes sql/sql_table.cc: A numbre of fixes
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/handler.h b/sql/handler.h
index 205f137e28a..00bfaa77e91 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -799,7 +799,7 @@ typedef int (*get_partitions_in_range_iter)(partition_info *part_info,
PARTITION_ITERATOR *part_iter);
-struct TABLE_LOG_MEMORY_ENTRY;
+struct st_table_log_memory_entry;
class partition_info : public Sql_alloc
{
@@ -848,8 +848,8 @@ public:
Item *item_free_list;
- TABLE_LOG_MEMORY_ENTRY *first_log_entry;
- TABLE_LOG_MEMORY_ENTRY *exec_log_entry;
+ st_table_log_memory_entry *first_log_entry;
+ st_table_log_memory_entry *exec_log_entry;
/*
A bitmap of partitions used by the current query.
Usage pattern:
@@ -961,6 +961,7 @@ public:
part_field_array(NULL), subpart_field_array(NULL),
full_part_field_array(NULL),
part_expr(NULL), subpart_expr(NULL), item_free_list(NULL),
+ first_log_entry(NULL), exec_log_entry(NULL),
list_array(NULL),
part_info_string(NULL),
part_func_string(NULL), subpart_func_string(NULL),