diff options
| author | unknown <evgen@moonbone.local> | 2006-05-24 20:52:57 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-05-24 20:52:57 +0400 |
| commit | 5c398ce055f4cba437bcb49cf99b5c3143a980cd (patch) | |
| tree | 8e12ad5315120fa62b601bc193647572b73318fe /sql/field.cc | |
| parent | a04d9fa947ec5fc22368c15d7c6c7ba47898405f (diff) | |
| parent | 0792cd92f6f183da37530c6042df4d0b5e52832e (diff) | |
| download | mariadb-git-5c398ce055f4cba437bcb49cf99b5c3143a980cd.tar.gz | |
Manually merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.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 9c504f186b3..e1d7aaf6343 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1223,7 +1223,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), dflt_field(0) { flags=null_ptr ? 0: NOT_NULL_FLAG; comment.str= (char*) ""; |