From 50563d39309ba82448a31f6a98e40181422f5147 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Mar 2007 16:15:38 +0500 Subject: Bug #27084 partitioning by list seems failing when using case creation of the partitioned table could fail as we created Item-s for it's list function in thd->mem_root, and then do Item->fix_fields in the context of other table->mem_root (so that memory alloced there was alloced in this table->mem_root). As we freed the table->mem_root before we do thd->free_items, our Item-s had pointers to the freed memory, that caused the crash mysql-test/r/partition.result: result mysql-test/t/partition.test: testcase sql/item_cmpfunc.cc: here is better place for the implementation sql/item_cmpfunc.h: implementation moved to .cc file sql/sql_partition.cc: work_part_info_used parameter added to mysql_unpack_partition sql/sql_partition.h: work_part_info_used parameter added to mysql_unpack_partition sql/table.cc: we do 'fix_partition_func' using the proper arena now. It's necessary as Item_*::fix_fields can alloc memory using thd->mem_root and this has to be same mem_root that we used to alloc these Item-s --- sql/item_cmpfunc.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'sql/item_cmpfunc.h') diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index edc905d50ff..8919d955355 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1106,18 +1106,7 @@ public: Item *find_item(String *str); CHARSET_INFO *compare_collation() { return cmp_collation.collation; } bool check_partition_func_processor(byte *bool_arg) { return FALSE;} - void cleanup() - { - uint i; - DBUG_ENTER("Item_func_case::cleanup"); - Item_func::cleanup(); - for (i= 0; i <= (uint)DECIMAL_RESULT; i++) - { - delete cmp_items[i]; - cmp_items[i]= 0; - } - DBUG_VOID_RETURN; - } + void cleanup(); }; /* -- cgit v1.2.1