diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-12-19 15:59:05 +0100 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-12-19 15:59:05 +0100 |
| commit | 5480cbd69ec553dbb266533474989ce62774516c (patch) | |
| tree | 3f1a6986c8f700958371ae168aab9940cd26789b /sql/field.h | |
| parent | 55d284d424c954888536f615731a61d039d80ac1 (diff) | |
| parent | 94f75ffcce4daddfb709bd269fc90d1513833966 (diff) | |
| download | mariadb-git-5480cbd69ec553dbb266533474989ce62774516c.tar.gz | |
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into linux-st28.site:/home/martin/mysql/src/bug32848/my50-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 05c22092e53..e5c473ed556 100644 --- a/sql/field.h +++ b/sql/field.h @@ -89,6 +89,16 @@ public: uint field_index; // field number in fields array uint16 flags; 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(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,uchar null_bit_arg, utype unireg_check_arg, const char *field_name_arg, |