diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-05-26 20:59:40 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-05-26 20:59:40 +0300 |
| commit | a132e799c5575aa07908f5fbcd4e680a881aae64 (patch) | |
| tree | 4767435993695213f8e3bdc730b86d4730dbdacf /sql/field.h | |
| parent | da9bf1dec30f9d1cda414d0a96ca93c11b1a77e7 (diff) | |
| parent | 1ef96d2b76452c06d6b9aa6ed57767abbb96c769 (diff) | |
| download | mariadb-git-a132e799c5575aa07908f5fbcd4e680a881aae64.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
sql/field.h:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 4e468c7211b..4456eb36731 100644 --- a/sql/field.h +++ b/sql/field.h @@ -83,7 +83,8 @@ public: virtual void reset_fields() {} virtual void set_default() { - my_ptrdiff_t offset = table->default_values - table->record[0]; + my_ptrdiff_t offset = (my_ptrdiff_t) (table->default_values - + table->record[0]); memcpy(ptr, ptr + offset, pack_length()); if (null_ptr) *null_ptr= ((*null_ptr & (uchar) ~null_bit) | |