create table monitor_test(a char(3), b int, c char(2),

primary key (a(1), c(1)), key(b)) engine = innodb;

insert into monitor_test values("13", 2, "aa");

select a from monitor_test where b < 3;

diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc

index 01cf3b107a8..8afabf6220c 100644

--- a/storage/innobase/row/row0sel.cc

+++ b/storage/innobase/row/row0sel.cc

@@ -4202,7 +4202,9 @@ bool row_search_with_covering_prefix(

 	const dict_index_t*	index = prebuilt->index;

 	ut_ad(!dict_index_is_clust(index));

-	if (dict_index_is_spatial(index)) {

+	/* In ha_innobase::build_template() we choose to access the

+	whole row when using exclusive row locks. */

+	if (prebuilt->select_lock_type == LOCK_X || !index->is_btree()) {

 		return false;

 	}