diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-08-28 12:54:50 +0300 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-08-28 12:54:50 +0300 |
| commit | 4c318bf6e85ec1321b4f099e3bb829a6abb74d0d (patch) | |
| tree | 458167977d24af9a6e787029172c907cc01999f3 /sql/field.h | |
| parent | da2d3e3fce3b2408e3f277d597837933d9a1d680 (diff) | |
| parent | 0e3bc47fb4c4184c2a749563c131156bbddc876b (diff) | |
| download | mariadb-git-4c318bf6e85ec1321b4f099e3bb829a6abb74d0d.tar.gz | |
merge 5.0-bugteam -> 5.1-bugteam
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index 36f494f6e50..0d0d7fba116 100644 --- a/sql/field.h +++ b/sql/field.h @@ -147,7 +147,7 @@ public: virtual bool eq(Field *field) { return (ptr == field->ptr && null_ptr == field->null_ptr && - null_bit == field->null_bit); + null_bit == field->null_bit && field->type() == type()); } virtual bool eq_def(Field *field); @@ -1960,7 +1960,6 @@ public: bool eq(Field *field) { return (Field::eq(field) && - field->type() == type() && bit_ptr == ((Field_bit *)field)->bit_ptr && bit_ofs == ((Field_bit *)field)->bit_ofs); } |