diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-09-23 15:21:29 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-09-23 15:21:29 +0200 |
| commit | 6a89842e3642729fbac20a92a1655452f4d45487 (patch) | |
| tree | be24d592bff31a5a07c28cb307d81ed4f01b925a /sql/sql_partition.cc | |
| parent | d49913877064778d8301c7bbd610238b3f5422cd (diff) | |
| download | mariadb-git-6a89842e3642729fbac20a92a1655452f4d45487.tar.gz | |
Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2
Cleaning up warnings not present in 5.0.
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 08ff2daacb9..2fb09ab7566 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -7098,9 +7098,9 @@ static uint32 get_next_partition_via_walking(PARTITION_ITERATOR *part_iter) longlong dummy; field->store(part_iter->field_vals.cur++, ((Field_num*)field)->unsigned_flag); - if (part_iter->part_info->is_sub_partitioned() && + if ((part_iter->part_info->is_sub_partitioned() && !part_iter->part_info->get_part_partition_id(part_iter->part_info, - &part_id, &dummy) || + &part_id, &dummy)) || !part_iter->part_info->get_partition_id(part_iter->part_info, &part_id, &dummy)) return part_id; |