diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-12-21 14:52:39 +0100 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-12-21 14:52:39 +0100 |
| commit | baf5c2c132f498df72c5c8196d591481e03b9fee (patch) | |
| tree | 4db05ce0abde8a41b21fcb0c65c94ab0635b8952 /sql/field.h | |
| parent | 3a13408f8547b0f15952b8fd909bcc527910cc1a (diff) | |
| parent | fbb25b7cecf468eb4e422e22cd3aa2da4ba0fa8a (diff) | |
| download | mariadb-git-baf5c2c132f498df72c5c8196d591481e03b9fee.tar.gz | |
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/union.result:
Bug#32848: Manual merge
mysql-test/t/union.test:
Bug#32848: Manual merge
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index 27be2601270..dc4f1b13cb5 100644 --- a/sql/field.h +++ b/sql/field.h @@ -90,6 +90,16 @@ public: uint32 flags; uint16 field_index; // field number in fields array uchar null_bit; // Bit used to test null bit + /** + If true, this field was created in create_tmp_field_from_item from a NULL + value. This means that the type of the field is just a guess, and the type + may be freely coerced to another type. + + @see create_tmp_field_from_item + @see Item_type_holder::get_real_type + + */ + bool is_created_from_null_item; Field(uchar *ptr_arg,uint32 length_arg,uchar *null_ptr_arg, uchar null_bit_arg, utype unireg_check_arg, |