diff options
| author | venu@myvenu.com <> | 2003-05-21 00:12:09 -0700 |
|---|---|---|
| committer | venu@myvenu.com <> | 2003-05-21 00:12:09 -0700 |
| commit | 39cbb547d433f7fdcfbe5655f14ffb8c93fe6122 (patch) | |
| tree | 390fab0240f652c5c3ddbf153549ac34cb5c1b2b /sql/field.h | |
| parent | 9ad75823e7406c3afec09e642615e4821d25df5a (diff) | |
| parent | 666d46b6ee19c0399fadff220952a9ac9a097f85 (diff) | |
| download | mariadb-git-39cbb547d433f7fdcfbe5655f14ffb8c93fe6122.tar.gz | |
Resolve merge colflict
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index 4349e8fe26d..8e395b7cace 100644 --- a/sql/field.h +++ b/sql/field.h @@ -57,7 +57,7 @@ public: GEOM_GEOMETRYCOLLECTION = 7 }; enum imagetype { itRAW, itMBR}; - + utype unireg_check; uint32 field_length; // Length of field uint16 flags; @@ -83,7 +83,7 @@ public: virtual void reset_fields() {} virtual void set_default() { - my_ptrdiff_t offset = table->default_values() - table->record[0]; + my_ptrdiff_t offset = table->default_values - table->record[0]; memcpy(ptr, ptr + offset, pack_length()); if (null_ptr) *null_ptr= ((*null_ptr & (uchar) ~null_bit) | |