diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-03-07 01:20:56 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-03-07 01:20:56 +0200 |
| commit | 81f368cc549ebd0078ef64b61bd92332edb5d319 (patch) | |
| tree | 473a02ad21d3dcb150966988c72ab2d2a3dd7601 /sql/field.h | |
| parent | 7ae420a4a17fab1b45ee56dc5cac2f8d9063baa5 (diff) | |
| parent | 5861dc5b8b39b3f822a8968963a4783541d59b77 (diff) | |
| download | mariadb-git-81f368cc549ebd0078ef64b61bd92332edb5d319.tar.gz | |
Merge to get fix for LOCK TABLES + DROP TABLE in another thread
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-delete.result:
Delete: mysql-test/r/delete.result
client/mysqlbinlog.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/field.h:
Auto merged
sql/lock.cc:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/type_datetime.result:
Update results after merge
sql/log_event.h:
Use local version
sql/mysql_priv.h:
Use local version
sql/mysqld.cc:
Use local version
sql/sql_repl.h:
Use local version
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()); } |