diff options
| author | unknown <mskold@mysql.com> | 2006-02-15 12:52:30 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-02-15 12:52:30 +0100 |
| commit | f8b27ebb54259d2e148db62ddd65761fe1ea36a9 (patch) | |
| tree | 53accc5efd3eed2f105b7864fe571d63b778ba78 /sql/sql_partition.cc | |
| parent | 0c8d763e81d72fd0fdf5ca08476192d935967efe (diff) | |
| parent | aa796cab7dac5bb8a9ce311b558cdfb96f7b3ece (diff) | |
| download | mariadb-git-f8b27ebb54259d2e148db62ddd65761fe1ea36a9.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
sql/sql_partition.cc:
Auto merged
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 6bee4d00573..71fbbcd2426 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -6065,7 +6065,10 @@ static uint32 get_next_partition_via_walking(PARTITION_ITERATOR *part_iter) field->store(part_iter->field_vals.start, FALSE); part_iter->field_vals.start++; longlong dummy; - if (!part_iter->part_info->get_partition_id(part_iter->part_info, + if (is_sub_partitioned(part_iter->part_info) && + !part_iter->part_info->get_part_partition_id(part_iter->part_info, + &part_id, &dummy) || + !part_iter->part_info->get_partition_id(part_iter->part_info, &part_id, &dummy)) return part_id; } |