diff options
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 1c9db78da4f..f8ec026be66 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -524,8 +524,8 @@ static int parse_url_error(FEDERATEDX_SHARE *share, TABLE_SHARE *table_s, int buf_len; DBUG_ENTER("ha_federatedx parse_url_error"); - buf_len= min(table_s->connect_string.length, - FEDERATEDX_QUERY_BUFFER_SIZE-1); + buf_len= MY_MIN(table_s->connect_string.length, + FEDERATEDX_QUERY_BUFFER_SIZE-1); strmake(buf, table_s->connect_string.str, buf_len); my_error(error_num, MYF(0), buf, 14); DBUG_RETURN(error_num); @@ -1237,16 +1237,16 @@ bool ha_federatedx::create_where_from_key(String *to, tmp.append(STRING_WITH_LEN(" (")); } - for (key_part= key_info->key_part, - remainder= key_info->key_parts, - length= ranges[i]->length, - ptr= ranges[i]->key; ; + for (key_part= key_info->key_part, + remainder= key_info->user_defined_key_parts, + length= ranges[i]->length, + ptr= ranges[i]->key; ; remainder--, - key_part++) + key_part++) { Field *field= key_part->field; uint store_length= key_part->store_length; - uint part_length= min(store_length, length); + uint part_length= MY_MIN(store_length, length); needs_quotes= field->str_needs_quotes(); DBUG_DUMP("key, start of loop", ptr, length); |