diff options
author | unknown <pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-03-22 00:17:22 -0500 |
---|---|---|
committer | unknown <pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-03-22 00:17:22 -0500 |
commit | 1c6f84f8284a297c166c1a53ab117df9b9a5239c (patch) | |
tree | 8005e77488f8d5fa6d32f59afdb313d55ec1d677 /sql/partition_info.h | |
parent | 88a1cff6efa23159644fba475424e83d3a313c45 (diff) | |
download | mariadb-git-1c6f84f8284a297c166c1a53ab117df9b9a5239c.tar.gz |
manual merge
Diffstat (limited to 'sql/partition_info.h')
-rw-r--r-- | sql/partition_info.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/partition_info.h b/sql/partition_info.h index 69aef512a67..eec7db90ad0 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -28,7 +28,7 @@ typedef int (*get_part_id_func)(partition_info *part_info, longlong *func_value); typedef uint32 (*get_subpart_id_func)(partition_info *part_info); - +struct st_table_log_memory_entry; class partition_info : public Sql_alloc { @@ -76,7 +76,11 @@ public: Item *subpart_expr; Item *item_free_list; - + + struct st_table_log_memory_entry *first_log_entry; + struct st_table_log_memory_entry *exec_log_entry; + struct st_table_log_memory_entry *frm_log_entry; + /* A bitmap of partitions used by the current query. Usage pattern: @@ -191,6 +195,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), frm_log_entry(NULL), list_array(NULL), part_info_string(NULL), part_func_string(NULL), subpart_func_string(NULL), |