diff options
| author | mhansson/martin@linux-st28.site <> | 2007-12-20 14:19:52 +0100 |
|---|---|---|
| committer | mhansson/martin@linux-st28.site <> | 2007-12-20 14:19:52 +0100 |
| commit | fe93176c30da5f6ef05b0d8f766d2365a65f2bbd (patch) | |
| tree | 24684b7fbc4f86b23098e9dab181f05103c2f368 /sql/field.cc | |
| parent | 9992761343753b074a4b8657726e625bc8c457a6 (diff) | |
| parent | 6f6e18809a43f0b76490ef04d0e730b6c7cb260a (diff) | |
| download | mariadb-git-fe93176c30da5f6ef05b0d8f766d2365a65f2bbd.tar.gz | |
Merge linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848-gca
into linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848-gca
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 169ef03dc75..8611e5ad675 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1307,7 +1307,8 @@ Field::Field(uchar *ptr_arg,uint32 length_arg,uchar *null_ptr_arg, field_name(field_name_arg), key_start(0), part_of_key(0), part_of_key_not_clustered(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), + is_created_from_null_item(FALSE) { flags=null_ptr ? 0: NOT_NULL_FLAG; comment.str= (char*) ""; |