database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Resolve merge colflict

Browse Source
This commit is contained in:
venu@myvenu.com
2003-05-21 00:12:09 -07:00
parent 9ad75823e7 666d46b6ee
commit 39cbb547d4
132 changed files with 1238 additions and 39342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/field.h
View File

@ -57,7 +57,7 @@ public:
GEOM_GEOMETRYCOLLECTION = 7
};
enum imagetype { itRAW, itMBR};
utype unireg_check;
uint32 field_length; // Length of field
uint16 flags;
@ -83,7 +83,7 @@ public:
virtual void reset_fields() {}
virtual void set_default()
{
my_ptrdiff_t offset = table->default_values() - table->record[0];
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) |