diff options
| author | unknown <holyfoot@mysql.com> | 2006-03-20 19:22:56 +0400 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-03-20 19:22:56 +0400 |
| commit | 6315e46af2e88b694fdd15abbd4fa637fbd21bf4 (patch) | |
| tree | 9e913ba8bf17fc3e0b4ed769ff19b428d5eacf45 /sql/sql_partition.cc | |
| parent | 851f4fb9545fd7b44f222eff294937e2f2d6871e (diff) | |
| parent | 91eac0bdc3b212967f73e221463e8173686863ca (diff) | |
| download | mariadb-git-6315e46af2e88b694fdd15abbd4fa637fbd21bf4.tar.gz | |
merging
sql/sql_partition.cc:
Auto merged
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 3cd6a87682f..608db994f66 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1710,6 +1710,7 @@ bool fix_partition_func(THD *thd, const char* name, TABLE *table, char* db_name; partition_info *part_info= table->part_info; ulong save_set_query_id= thd->set_query_id; + Item *thd_free_list= thd->free_list; DBUG_ENTER("fix_partition_func"); if (part_info->fixed) @@ -1744,6 +1745,7 @@ bool fix_partition_func(THD *thd, const char* name, TABLE *table, DBUG_RETURN(TRUE); } } + thd->free_list= part_info->item_free_list; if (part_info->is_sub_partitioned()) { DBUG_ASSERT(part_info->subpart_type == HASH_PARTITION); @@ -1853,6 +1855,7 @@ bool fix_partition_func(THD *thd, const char* name, TABLE *table, set_up_range_analysis_info(part_info); result= FALSE; end: + thd->free_list= thd_free_list; thd->set_query_id= save_set_query_id; DBUG_PRINT("info", ("thd->set_query_id: %d", thd->set_query_id)); DBUG_RETURN(result); |