diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-10-19 12:09:52 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-10-19 12:09:52 +0200 |
| commit | 93e02adcfab140265d3baf2062057826b3a28bc2 (patch) | |
| tree | 11acbcf83ba9f40be4d590a80de9558743535f17 /sql/partition_info.h | |
| parent | 6e7a37d3e8fc1f32c382dae143eb091be1eb1e8f (diff) | |
| parent | df129b749d609b75077ab7d60d65d40ff77b8299 (diff) | |
| download | mariadb-git-93e02adcfab140265d3baf2062057826b3a28bc2.tar.gz | |
Manual merge mysql-trunk -> mysql-trunk-wl3352
Diffstat (limited to 'sql/partition_info.h')
| -rw-r--r-- | sql/partition_info.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/partition_info.h b/sql/partition_info.h index 01d6ea93e2b..f668dde99d6 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -309,6 +309,7 @@ static inline void init_single_partition_iterator(uint32 part_id, { part_iter->part_nums.start= part_iter->part_nums.cur= part_id; part_iter->part_nums.end= part_id+1; + part_iter->ret_null_part= part_iter->ret_null_part_orig= FALSE; part_iter->get_next= get_next_partition_id_range; } @@ -319,5 +320,6 @@ void init_all_partitions_iterator(partition_info *part_info, { part_iter->part_nums.start= part_iter->part_nums.cur= 0; part_iter->part_nums.end= part_info->num_parts; + part_iter->ret_null_part= part_iter->ret_null_part_orig= FALSE; part_iter->get_next= get_next_partition_id_range; } |