Merge linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848-gca

into  linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848-gca

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/field.h b/sql/field.h
index 8aad6783291..7d3c2e75900 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -89,6 +89,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,