1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge dator5.(none):/home/pappa/bug20583

Browse Source 
into  dator5.(none):/home/pappa/bug17138


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
This commit is contained in:
unknown 2006-07-01 00:28:04 -04:00
commit 60d070b273
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/partition.result
View File

@ -1074,4 +1074,12 @@ end//
call mysqltest_1()//
drop table t1;
drop procedure mysqltest_1;
create table t1 (a int, index(a))
partition by hash(a);
insert into t1 values (1),(2);
select * from t1 ORDER BY a DESC;
a
2
1
drop table t1;
End of 5.1 tests

9
mysql-test/t/partition.test
View File

@ -1252,4 +1252,13 @@ delimiter ;//
drop table t1;
drop procedure mysqltest_1;
#
# Bug 20583 Partitions: Crash using index_last
#
create table t1 (a int, index(a))
partition by hash(a);
insert into t1 values (1),(2);
select * from t1 ORDER BY a DESC;
drop table t1;
--echo End of 5.1 tests

3
sql/ha_partition.cc
View File

@ -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);
}