merging.
This commit is contained in:
commit
f94eafb262
@ -3731,7 +3731,6 @@ convert_search_mode_to_innobase(
|
|||||||
case HA_READ_MBR_WITHIN:
|
case HA_READ_MBR_WITHIN:
|
||||||
case HA_READ_MBR_DISJOINT:
|
case HA_READ_MBR_DISJOINT:
|
||||||
case HA_READ_MBR_EQUAL:
|
case HA_READ_MBR_EQUAL:
|
||||||
my_error(ER_TABLE_CANT_HANDLE_SPKEYS, MYF(0));
|
|
||||||
return(PAGE_CUR_UNSUPP);
|
return(PAGE_CUR_UNSUPP);
|
||||||
/* do not use "default:" in order to produce a gcc warning:
|
/* do not use "default:" in order to produce a gcc warning:
|
||||||
enumeration value '...' not handled in switch
|
enumeration value '...' not handled in switch
|
||||||
@ -5212,7 +5211,7 @@ ha_innobase::records_in_range(
|
|||||||
mode2);
|
mode2);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
n_rows = 0;
|
n_rows = HA_POS_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
dtuple_free_for_mysql(heap1);
|
dtuple_free_for_mysql(heap1);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user