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.cc | |
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.cc')
-rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 044684b2675..04859dd22e0 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -183,7 +183,7 @@ Field::Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg, field_name(field_name_arg), query_id(0),key_start(0),part_of_key(0),part_of_sortkey(0), unireg_check(unireg_check_arg), - field_length(length_arg),null_bit(null_bit_arg) + field_length(length_arg),null_bit(null_bit_arg),abs_offset(0) { flags=null_ptr ? 0: NOT_NULL_FLAG; comment.str= (char*) ""; |