diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-26 17:03:57 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-26 17:03:57 +0300 |
| commit | 9887430fc0220b60f2db33d611e90aa939923811 (patch) | |
| tree | 6d00e687736fd42c31993c71c3b97e223e0f46ae /sql/field.h | |
| parent | a88dac081ec84e28d5143e9e7ac5b5bfa3ddfb02 (diff) | |
| parent | ec5051fff447914216c87378930d6234735da3a7 (diff) | |
| download | mariadb-git-9887430fc0220b60f2db33d611e90aa939923811.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/WL3527-5.1-opt
mysql-test/r/gis.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/subselect.result:
merge 5.0-opt -> 5.1-opt
mysql-test/t/subselect.test:
merge 5.0-opt -> 5.1-opt
sql/sql_base.cc:
merge 5.0-opt -> 5.1-opt
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 b96be208e41..12f94adcc0e 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1353,7 +1353,7 @@ public: int store_decimal(const my_decimal *); void get_key_image(char *buff,uint length,imagetype type); uint size_of() const { return sizeof(*this); } - int reset(void) { return !maybe_null(); } + int reset(void) { return !maybe_null() || Field_blob::reset(); } }; #endif /*HAVE_SPATIAL*/ |