Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1

into deer.mysql.r18.ru:/home/hf/work/mysql-default

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; }