diff options
| author | unknown <mikael@dator5.(none)> | 2006-07-01 00:22:25 -0400 |
|---|---|---|
| committer | unknown <mikael@dator5.(none)> | 2006-07-01 00:22:25 -0400 |
| commit | 3ed74d0e8d686ee0752a5109cdc5271618d1f006 (patch) | |
| tree | 37a7f5facce4101fbc4ed0028dca1ea38e8c5886 /sql/ha_partition.cc | |
| parent | 936fcddb7e7a7223ddffa38080c55cc350ef5c43 (diff) | |
| parent | aa475d48a43094d984cb45c52807de0eab979a82 (diff) | |
| download | mariadb-git-3ed74d0e8d686ee0752a5109cdc5271618d1f006.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug20583
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/ha_partition.cc:
Auto merged
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 7929257d608..c0257e08537 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -3400,7 +3400,8 @@ int ha_partition::common_first_last(byte *buf) if ((error= partition_scan_set_up(buf, FALSE))) return error; - if (!m_ordered_scan_ongoing) + if (!m_ordered_scan_ongoing && + m_index_scan_type != partition_index_last) return handle_unordered_scan_next_partition(buf); return handle_ordered_index_scan(buf); } |