Commit c71004dc authored by Alexey Botchkov's avatar Alexey Botchkov

merging.

parents 8d5286d2 953f6531
...@@ -3731,7 +3731,6 @@ convert_search_mode_to_innobase( ...@@ -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( ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment