diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-27 13:54:14 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-27 13:54:14 +0100 |
| commit | 7fa02f5c0ba4c3060cbff8cf9d1e472d268f3dad (patch) | |
| tree | b16c43d92abcb99316b2de31770c567e1c70bfa6 /sql/field.h | |
| parent | 672cdcbb93a7355c715f3e232d4c5852209f30b5 (diff) | |
| parent | c8f9bb2718c4ed7b464504c54df961bfeb2cccca (diff) | |
| download | mariadb-git-7fa02f5c0ba4c3060cbff8cf9d1e472d268f3dad.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index 43bcfe5590a..fafe0557ddc 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1827,7 +1827,14 @@ public: key_map get_possible_keys(); /* Hash value */ - virtual void hash(ulong *nr, ulong *nr2); + void hash(Hasher *hasher) + { + if (is_null()) + hasher->add_null(); + else + hash_not_null(hasher); + } + virtual void hash_not_null(Hasher *hasher); /** Get the upper limit of the MySQL integral and floating-point type. @@ -4196,7 +4203,7 @@ public: uchar *new_ptr, uint32 length, uchar *new_null_ptr, uint new_null_bit) override; bool is_equal(const Column_definition &new_field) const override; - void hash(ulong *nr, ulong *nr2) override; + void hash_not_null(Hasher *hasher) override; uint length_size() const override { return length_bytes; } void print_key_value(String *out, uint32 length) override; Binlog_type_info binlog_type_info() const override; @@ -4456,6 +4463,7 @@ public: bool make_empty_rec_store_default_value(THD *thd, Item *item) override; int store(const char *to, size_t length, CHARSET_INFO *charset) override; using Field_str::store; + void hash_not_null(Hasher *hasher) override; double val_real() override; longlong val_int() override; String *val_str(String *, String *) override; @@ -5032,7 +5040,7 @@ public: if (bit_ptr) bit_ptr= ADD_TO_PTR(bit_ptr, ptr_diff, uchar*); } - void hash(ulong *nr, ulong *nr2) override; + void hash_not_null(Hasher *hasher) override; SEL_ARG *get_mm_leaf(RANGE_OPT_PARAM *param, KEY_PART *key_part, const Item_bool_func *cond, |