mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Conflicts resolving
This commit is contained in:
@ -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; }
|
||||
|
Reference in New Issue
Block a user