diff options
| author | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-04-21 08:57:53 -0400 |
|---|---|---|
| committer | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-04-21 08:57:53 -0400 |
| commit | 3d7999d0bfa856ad10834e7e20490731a020e2e3 (patch) | |
| tree | 1692708a9784edd5d84d79a578893b97d7f47e82 /sql/partition_info.h | |
| parent | 17e3ee35531d0003de31093570e64f604bd8c4fa (diff) | |
| parent | b71afda5f75fb74be73231217396ce1258ca535a (diff) | |
| download | mariadb-git-3d7999d0bfa856ad10834e7e20490731a020e2e3.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
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 664c8834b0b..76118be4dda 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_ddl_log_memory_entry; class partition_info : public Sql_alloc { @@ -76,7 +76,11 @@ public: Item *subpart_expr; Item *item_free_list; - + + struct st_ddl_log_memory_entry *first_log_entry; + struct st_ddl_log_memory_entry *exec_log_entry; + struct st_ddl_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), |