diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2003-01-21 20:24:22 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2003-01-21 20:24:22 +0400 |
| commit | 96b86dcc9a1e87f01f73186308e8c35f6f900452 (patch) | |
| tree | d7f4d2af987de7eecb9c287d185d14b4581f38fe /sql/field.h | |
| parent | aec72f3315b1b0ddf1c9ca86555bbf26004a3a2e (diff) | |
| parent | dceabff13192f614efd5b688d81e73e4aeeb96b2 (diff) | |
| download | mariadb-git-96b86dcc9a1e87f01f73186308e8c35f6f900452.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index 97900938e9d..dc0b1b35d5b 100644 --- a/sql/field.h +++ b/sql/field.h @@ -78,10 +78,11 @@ public: virtual void reset_fields() {} virtual void set_default() { - memcpy(ptr, ptr + table->rec_buff_length, pack_length()); + 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) | - null_ptr[table->rec_buff_length] & null_bit); + null_ptr[offset] & null_bit); } virtual bool binary() const { return 1; } virtual bool zero_pack() const { return 1; } |