diff options
| author | unknown <monty@mysql.com> | 2004-04-05 16:28:16 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-04-05 16:28:16 +0300 |
| commit | 9d0166363eaaccdf79961c4320590c2d5040e7bb (patch) | |
| tree | 2c8ec348c331cb6321acc9ec80f6b07df0a8d51e /sql/field.h | |
| parent | 73d0a99142e8459d3e9207a5bc57b9eb5c921970 (diff) | |
| parent | 7873b89fc50d420a5f538a5b60faf79131f86c4f (diff) | |
| download | mariadb-git-9d0166363eaaccdf79961c4320590c2d5040e7bb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 258c18257f0..75bb96f2f6d 100644 --- a/sql/field.h +++ b/sql/field.h @@ -87,7 +87,6 @@ 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, |