Merge branch '10.1' into 10.2

1 files changed, 2 insertions, 5 deletions

diff --git a/sql/field.h b/sql/field.h
index fd68ade1165..f0c3b48cd6a 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -948,14 +948,11 @@ public:
   */
   void set_has_explicit_value()
   {
-    if (table->has_value_set)             /* If we have default functions */
-      bitmap_set_bit(table->has_value_set, field_index);
+    bitmap_set_bit(&table->has_value_set, field_index);
   }
   bool has_explicit_value()
   {
-    /* This function is only called when we have default functions */
-    DBUG_ASSERT(table->has_value_set);
-    return bitmap_is_set(table->has_value_set, field_index);
+    return bitmap_is_set(&table->has_value_set, field_index);
   }
   virtual void set_explicit_default(Item *value);