diff options
| author | unknown <mronstrom@mysql.com> | 2005-05-07 11:23:09 +0200 |
|---|---|---|
| committer | unknown <mronstrom@mysql.com> | 2005-05-07 11:23:09 +0200 |
| commit | f8b75e07a53058b0e5f1e0dad9188604ab6cde9b (patch) | |
| tree | 2c16957c304e7c835baca5890a3cb59fc4e05e72 /sql/field.h | |
| parent | 303229750d5f717a3174f34ba056482951a8a0a2 (diff) | |
| parent | fdde665e762d9ae6d4230a5167bcbc68b74589a3 (diff) | |
| download | mariadb-git-f8b75e07a53058b0e5f1e0dad9188604ab6cde9b.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/Users/mikron/wl1682
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index ac9c2f351b3..88ea935c20a 100644 --- a/sql/field.h +++ b/sql/field.h @@ -86,6 +86,10 @@ public: utype unireg_check; uint32 field_length; // Length of field uint16 flags; + /* fieldnr is the id of the field (first field = 1) as is also + used in key_part. + */ + uint16 fieldnr; uchar null_bit; // Bit used to test null bit Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,uchar null_bit_arg, |