summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2011-01-10 12:53:24 +0100
committerMattias Jonsson <mattias.jonsson@oracle.com>2011-01-10 12:53:24 +0100
commit770c3f3a7a132a37b661381a918c4e2218754fa6 (patch)
treee2b4f758f82ea46195b80bd48d22affb7e4da4ab
parent544451bbd814b3576c718cc20da6d025ab791248 (diff)
parentdb830d26b346fd98bc595e747ea33159a0f5994b (diff)
downloadmariadb-git-770c3f3a7a132a37b661381a918c4e2218754fa6.tar.gz
merge
-rw-r--r--sql/table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 18523f08551..b43d29294a8 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1867,8 +1867,8 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
{
if (work_part_info_used)
tmp= fix_partition_func(thd, outparam, is_create_table);
- outparam->part_info->item_free_list= part_func_arena.free_list;
}
+ outparam->part_info->item_free_list= part_func_arena.free_list;
partititon_err:
if (tmp)
{