diff options
| author | monty@hundin.mysql.fi <> | 2002-11-05 00:24:59 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-11-05 00:24:59 +0200 |
| commit | 537f1c2f1e69ac6f965b0823f422592dbbd4dc10 (patch) | |
| tree | 2387026bb6d1bb1e37ed577bf96a0822fac9ed3c /sql | |
| parent | 79c31cdf62f0d3126fba1d844782c165843d4fb8 (diff) | |
| download | mariadb-git-537f1c2f1e69ac6f965b0823f422592dbbd4dc10.tar.gz | |
Removed wrong bug fix for problem with timestamp and BETWEEN.
Will be properly fixed in 4.1 and 5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.h | 1 | ||||
| -rw-r--r-- | sql/item_cmpfunc.cc | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index 92e098c75c4..e822f6a71d6 100644 --- a/sql/field.h +++ b/sql/field.h @@ -533,7 +533,6 @@ public: enum Item_result result_type () const { return field_length == 8 || field_length == 14 ? INT_RESULT : STRING_RESULT; } enum_field_types type() const { return FIELD_TYPE_TIMESTAMP;} enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONG_INT; } - enum Item_result cmp_type () const { return INT_RESULT; } void store(const char *to,uint length); void store(double nr); void store(longlong nr); diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 4650b770299..36ecde337a7 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -354,7 +354,6 @@ void Item_func_between::fix_length_and_dec() if (args[0]->type() == FIELD_ITEM) { Field *field=((Item_field*) args[0])->field; - cmp_type=field->cmp_type(); if (field->store_for_compare()) { if (convert_constant_item(field,&args[1])) |