diff options
| author | unknown <wax@kishkin.ru> | 2003-06-26 05:06:49 +0600 |
|---|---|---|
| committer | unknown <wax@kishkin.ru> | 2003-06-26 05:06:49 +0600 |
| commit | 6350e8c14cd3560f264a28c37fa46286f835c867 (patch) | |
| tree | a464107c8a1f6dc2e6b90378bbfc621a4cbb539d /sql/field.h | |
| parent | 2534f837c177eda645ec45864b58fa5b44b1c083 (diff) | |
| parent | a58c324a132ec2d3f3382c79b7a56a3aff4220f8 (diff) | |
| download | mariadb-git-6350e8c14cd3560f264a28c37fa46286f835c867.tar.gz | |
Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g
sql/field.h:
Auto merged
sql/item_sum.cc:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index a72ccfa8354..5df7d554c35 100644 --- a/sql/field.h +++ b/sql/field.h @@ -66,6 +66,7 @@ public: uint32 field_length; // Length of field uint16 flags; uchar null_bit; // Bit used to test null bit + uint abs_offset; // use only in group_concat Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,uchar null_bit_arg, utype unireg_check_arg, const char *field_name_arg, |