Re: [Maria-developers] [Fwd: [Commits] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (igor:2823) Bug#604503]
Hello Igor, On Sat, Jul 17, 2010 at 12:42:49AM -0700, Igor Babaev wrote:
=== modified file 'sql/table.cc' --- a/sql/table.cc 2010-07-13 14:34:14 +0000 +++ b/sql/table.cc 2010-07-17 07:37:48 +0000 @@ -1930,8 +1930,6 @@ end: semantic analysis of the item by calling the the function fix_vcol_expr. Since the defining expression is part of the table definition the item for it is created in table->memroot within a separate Query_arena.
Please explicitly refer to TABLE::expr_arena in the above comment.
- The free_list of this arena is saved in field->vcol_info.item_free_list - to be freed when the table defition is removed from the TABLE_SHARE cache.
@note Before passing 'vcol_expr" to the parser the function embraces it in ... === modified file 'sql/table.h' --- a/sql/table.h 2010-06-03 09:28:54 +0000 +++ b/sql/table.h 2010-07-17 07:37:48 +0000 @@ -27,6 +27,7 @@ class st_select_lex; class partition_info; class COND_EQUAL; class Security_context; +class Query_arena;
/*************************************************************************/
@@ -869,6 +870,7 @@ struct st_table { MEM_ROOT mem_root; GRANT_INFO grant; FILESORT_INFO sort; + Query_arena *expr_arena; Please add a comment saying what is the new member for.
#ifdef WITH_PARTITION_STORAGE_ENGINE partition_info *part_info; /* Partition related information */ bool no_partitions_used; /* If true, all partitions have been pruned away */
Ok to push after the above is addressed. BR Sergey -- Sergey Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog
participants (1)
-
Sergey Petrunya