diff options
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 091a26f6f36..01c9e3df4ea 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -1292,10 +1292,21 @@ bool ha_federated::create_where_from_key(String *to, { if (*ptr++) { + /* + We got "IS [NOT] NULL" condition against nullable column. We + distinguish between "IS NOT NULL" and "IS NULL" by flag. For + "IS NULL", flag is set to HA_READ_KEY_EXACT. + */ if (emit_key_part_name(&tmp, key_part) || - tmp.append(STRING_WITH_LEN(" IS NULL "))) + tmp.append(ranges[i]->flag == HA_READ_KEY_EXACT ? + STRING_WITH_LEN(" IS NULL ") : + STRING_WITH_LEN(" IS NOT NULL "))) goto err; - continue; + /* + We need to adjust pointer and length to be prepared for next + key part. As well as check if this was last key part. + */ + goto prepare_for_next_key_part; } } @@ -1403,12 +1414,18 @@ bool ha_federated::create_where_from_key(String *to, if (tmp.append(STRING_WITH_LEN(") "))) goto err; +prepare_for_next_key_part: if (store_length >= length) break; DBUG_PRINT("info", ("remainder %d", remainder)); DBUG_ASSERT(remainder > 1); length-= store_length; - ptr+= store_length; + /* + For nullable columns, null-byte is already skipped before, that is + ptr was incremented by 1. Since store_length still counts null-byte, + we need to subtract 1 from store_length. + */ + ptr+= store_length - test(key_part->null_bit); if (tmp.append(STRING_WITH_LEN(" AND "))) goto err; |