diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-06-10 21:15:13 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-06-10 21:15:13 +0200 |
commit | 49874ff827bdbc33cb0be677b6262e8f7784f69b (patch) | |
tree | 6b5fcac310619cc790daf143f9f861125242516c /sql/field.h | |
parent | f1a5c49c4e9cee40d884193dd7477aff0cbffc53 (diff) | |
download | mariadb-git-49874ff827bdbc33cb0be677b6262e8f7784f69b.tar.gz |
more buildbot fixes
Diffstat (limited to 'sql/field.h')
-rw-r--r-- | sql/field.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sql/field.h b/sql/field.h index 02ce7a64374..2df0d1e512c 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1269,10 +1269,7 @@ public: { return Field::unpack(to, from, param_data); } uint size_of() const { return sizeof(*this); } bool eq_def(Field *field) - { - return (Field_str::eq_def(field) && - dec == ((Field_timestamp_hires*) field)->dec); - } + { return Field_str::eq_def(field) && dec == field->decimals(); } }; @@ -1450,11 +1447,6 @@ public: void sql_type(String &str) const; void make_field(Send_field *); uint size_of() const { return sizeof(*this); } - bool eq_def(Field *field) - { - return (Field_str::eq_def(field) && - dec == ((Field_time_hires*) field)->dec); - } }; class Field_datetime :public Field_temporal { @@ -1527,11 +1519,6 @@ public: const uchar *unpack(uchar* to, const uchar *from, uint param_data) { return Field::unpack(to, from, param_data); } uint size_of() const { return sizeof(*this); } - bool eq_def(Field *field) - { - return (Field_str::eq_def(field) && - dec == ((Field_datetime_hires*) field)->dec); - } }; static inline Field_timestamp * |