diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-01-10 15:08:31 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-01-10 15:08:31 +0100 |
| commit | b56308e63d74c619c4fe8b765c3745e728d804c8 (patch) | |
| tree | 23ed20d7372307636b325211cd801777b7e6e0d0 /sql/table.cc | |
| parent | a5263d0afb65fabc98cea354e3e5769f1f2b942e (diff) | |
| parent | 2f4741667867accad41d6b2d2a9ac67851ad35c0 (diff) | |
| download | mariadb-git-b56308e63d74c619c4fe8b765c3745e728d804c8.tar.gz | |
Manual merge from 5.1
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 8cd2e9e9bab..fae044f334a 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1963,8 +1963,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) { |