diff options
author | Alexander Barkov <bar@mariadb.com> | 2019-04-19 07:00:17 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2019-04-19 07:00:41 +0400 |
commit | 4233b28489826ffeebcc828aa6eb171d6f57ccdb (patch) | |
tree | 57f44a1fce7b2543054cd5476da7b847f03f485c /sql/field.h | |
parent | 878ca5ca4f8c5598f2e289a753327c87b5a8818c (diff) | |
download | mariadb-git-4233b28489826ffeebcc828aa6eb171d6f57ccdb.tar.gz |
MDEV-19283 Move the code from Field_str::is_equal() to Field_string::is_equal()
Diffstat (limited to 'sql/field.h')
-rw-r--r-- | sql/field.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index 8bd7343931b..35597d72927 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1504,7 +1504,7 @@ public: of a table is compatible with the old definition so that it can determine if data needs to be copied over (table data change). */ - virtual uint is_equal(Create_field *new_field); + virtual uint is_equal(Create_field *new_field)= 0; /* convert decimal to longlong with overflow check */ longlong convert_decimal2longlong(const my_decimal *val, bool unsigned_flag, int *err); @@ -1868,7 +1868,6 @@ public: my_decimal *val_decimal(my_decimal *); bool val_bool() { return val_real() != 0e0; } virtual bool str_needs_quotes() { return TRUE; } - uint is_equal(Create_field *new_field); bool eq_cmp_as_binary() { return MY_TEST(flags & BINARY_FLAG); } virtual uint length_size() { return 0; } double pos_in_interval(Field *min, Field *max) @@ -2640,6 +2639,7 @@ public: my_decimal *val_decimal(my_decimal *) { return 0; } String *val_str(String *value,String *value2) { value2->length(0); return value2;} + uint is_equal(Create_field *new_field); int cmp(const uchar *a, const uchar *b) { return 0;} void sort_string(uchar *buff, uint length) {} uint32 pack_length() const { return 0; } @@ -3563,6 +3563,7 @@ public: int cmp(const uchar *,const uchar *); void sort_string(uchar *buff,uint length); void sql_type(String &str) const; + uint is_equal(Create_field *new_field); virtual uchar *pack(uchar *to, const uchar *from, uint max_length); virtual const uchar *unpack(uchar* to, const uchar *from, |