database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge of bug#51851.

Browse Source 
Also moved HA_DATA_PARTITION from ha_partition.cc to table.h.
This commit is contained in:
Mattias Jonsson
2010-05-24 14:51:59 +02:00
parent 923da1e889 47906997c7
commit 7af0bbc3bc
18 changed files with 151 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sql/table.cc
View File

@ -967,28 +967,28 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
}
if (next_chunk + 5 < buff_end)
{
uint32 partition_info_len = uint4korr(next_chunk);
uint32 partition_info_str_len = uint4korr(next_chunk);
#ifdef WITH_PARTITION_STORAGE_ENGINE
if ((share->partition_info_buffer_size=
share->partition_info_len= partition_info_len))
share->partition_info_str_len= partition_info_str_len))
{
if (!(share->partition_info= (char*)
if (!(share->partition_info_str= (char*)
memdup_root(&share->mem_root, next_chunk + 4,
partition_info_len + 1)))
partition_info_str_len + 1)))
{
my_free(buff, MYF(0));
goto err;
}
}
#else
if (partition_info_len)
if (partition_info_str_len)
{
DBUG_PRINT("info", ("WITH_PARTITION_STORAGE_ENGINE is not defined"));
my_free(buff, MYF(0));
goto err;
}
#endif
next_chunk+= 5 + partition_info_len;
next_chunk+= 5 + partition_info_str_len;
}
#if MYSQL_VERSION_ID < 50200
if (share->mysql_version >= 50106 && share->mysql_version <= 50109)
@ -1651,6 +1651,10 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
my_hash_free(&share->name_hash);
if (share->ha_data_destroy)
share->ha_data_destroy(share->ha_data);
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (share->ha_part_data_destroy)
share->ha_part_data_destroy(share->ha_part_data);
#endif
open_table_error(share, error, share->open_errno, errarg);
DBUG_RETURN(error);
@ -1842,7 +1846,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
}
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (share->partition_info_len && outparam->file)
if (share->partition_info_str_len && outparam->file)
{
/*
In this execution we must avoid calling thd->change_item_tree since
@ -1863,10 +1867,8 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
bool tmp;
bool work_part_info_used;
tmp= mysql_unpack_partition(thd, share->partition_info,
share->partition_info_len,
share->part_state,
share->part_state_len,
tmp= mysql_unpack_partition(thd, share->partition_info_str,
share->partition_info_str_len,
outparam, is_create_table,
share->default_part_db_type,
&work_part_info_used);