diff options
| author | unknown <wax@kishkin.ru> | 2003-06-03 17:07:46 +0600 |
|---|---|---|
| committer | unknown <wax@kishkin.ru> | 2003-06-03 17:07:46 +0600 |
| commit | 284a6abeea27640bf7a726c06c90c5af9db09cf7 (patch) | |
| tree | f843ad0e54bde2b08179141dbc0431f17a5aefd6 /sql/field.h | |
| parent | 27d95e9687e840c98235a89ff7aea880bb905f44 (diff) | |
| parent | fbd157fa5754c5c1dac01ad824531aeb434426d7 (diff) | |
| download | mariadb-git-284a6abeea27640bf7a726c06c90c5af9db09cf7.tar.gz | |
Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4g
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
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 4456eb36731..21f2ab4b6e9 100644 --- a/sql/field.h +++ b/sql/field.h @@ -62,6 +62,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, |