Commit 60d070b2 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
parents a8e6d7f6 3ed74d0e

mysql-test/r/partition.result

+8 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/partition.test

+9 −0
Original line number Diff line number Diff line
@@ -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

sql/ha_partition.cc

+2 −1
Original line number Diff line number Diff line
@@ -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);

}