database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Conflicts resolving

Browse Source 
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.h:
  Conflict resolving
This commit is contained in:
unknown
2003-01-05 14:12:03 +04:00
parent cbd4de0ab8 7ef0dad72e
commit d33e652321
6 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/field.h
View File

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