diff options
| author | monty@mashka.mysql.fi <> | 2003-03-07 01:20:56 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-03-07 01:20:56 +0200 |
| commit | d56e2acf50715327e66045366da46e5fe2ddda09 (patch) | |
| tree | 473a02ad21d3dcb150966988c72ab2d2a3dd7601 /sql/field.h | |
| parent | 13de61cc3a3feebbca41553e62bbfb34acc7ad27 (diff) | |
| parent | c6432989841e029b10e40b64f847264ee0784567 (diff) | |
| download | mariadb-git-d56e2acf50715327e66045366da46e5fe2ddda09.tar.gz | |
Merge to get fix for LOCK TABLES + DROP TABLE in another thread
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index f064724f6a2..29c185505c7 100644 --- a/sql/field.h +++ b/sql/field.h @@ -65,7 +65,7 @@ public: virtual String *val_str(String*,String *)=0; virtual Item_result result_type () const=0; virtual Item_result cmp_type () const { return result_type(); } - bool eq(Field *field) { return ptr == field->ptr; } + bool eq(Field *field) { return ptr == field->ptr && null_ptr == field->null_ptr; } virtual bool eq_def(Field *field); virtual uint32 pack_length() const { return (uint32) field_length; } virtual void reset(void) { bzero(ptr,pack_length()); } |