diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-02-27 10:07:59 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-02-27 10:07:59 +0400 |
| commit | 47b7ffb396bd283bd4196194311ba39ed9692421 (patch) | |
| tree | ee69ec3d890c77a123f66b5c27ac0697163491ad /sql/field.h | |
| parent | 3f83801d8266fa465d296dbe528a5ea132945a84 (diff) | |
| parent | 78153cf641aea41166d3e79ae99b57b154f6a027 (diff) | |
| download | mariadb-git-47b7ffb396bd283bd4196194311ba39ed9692421.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/sql/field.h b/sql/field.h index 4b193cd704b..77556416465 100644 --- a/sql/field.h +++ b/sql/field.h @@ -945,16 +945,13 @@ 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); + virtual bool set_explicit_default(Item *value); /** Evaluates the @c UPDATE default function, if one exists, and stores the @@ -2379,9 +2376,9 @@ public: uint32 pack_length() const { return 4; } void sql_type(String &str) const; bool zero_pack() const { return 0; } - virtual int set_time(); - virtual void set_explicit_default(Item *value); - virtual int evaluate_update_default_function() + int set_time(); + bool set_explicit_default(Item *value); + int evaluate_update_default_function() { int res= 0; if (has_update_default_function()) @@ -2813,8 +2810,8 @@ public: void sql_type(String &str) const; bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate) { return Field_datetime::get_TIME(ltime, ptr, fuzzydate); } - virtual int set_time(); - virtual int evaluate_update_default_function() + int set_time(); + int evaluate_update_default_function() { int res= 0; if (has_update_default_function()) |