mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-08 08:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge reggie@192.168.0.9:/home/reggie/work/mysql-5.1-bug15408

Browse source 
into  big_geek.:C:/Work/mysql/mysql-5.1-bug15408


sql/ha_partition.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/handler.h:
  merging changes into my partition code reorg
This commit is contained in:
unknown 2006-02-16 11:07:21 -06:00
commit 8270eb50e4
15 changed files with 982 additions and 823 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/ha_partition.cc
View file

@ -186,7 +186,7 @@ ha_partition::ha_partition(TABLE_SHARE *share)
ha_partition::ha_partition(partition_info *part_info)
:handler(&partition_hton, NULL), m_part_info(part_info),
m_create_handler(TRUE),
m_is_sub_partitioned(is_sub_partitioned(m_part_info))
m_is_sub_partitioned(m_part_info->is_sub_partitioned())
{
DBUG_ENTER("ha_partition::ha_partition(part_info)");
@ -331,7 +331,7 @@ int ha_partition::ha_initialise()
if (m_create_handler)
{
m_tot_parts= get_tot_partitions(m_part_info);
m_tot_parts= m_part_info->get_tot_partitions();
DBUG_ASSERT(m_tot_parts > 0);
if (new_handlers_from_part_info())
DBUG_RETURN(1);
@ -1290,7 +1290,7 @@ int ha_partition::change_partitions(HA_CREATE_INFO *create_info,
DBUG_ENTER("ha_partition::change_partitions");
m_reorged_parts= 0;
if (!is_sub_partitioned(m_part_info))
if (!m_part_info->is_sub_partitioned())
no_subparts= 1;
/*
@ -1453,7 +1453,7 @@ int ha_partition::change_partitions(HA_CREATE_INFO *create_info,
if (part_elem->part_state == PART_CHANGED ||
(part_elem->part_state == PART_TO_BE_ADDED && temp_partitions))
name_variant= TEMP_PART_NAME;
if (is_sub_partitioned(m_part_info))
if (m_part_info->is_sub_partitioned())
{
List_iterator<partition_element> sub_it(part_elem->subpartitions);
uint j= 0, part;