diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 18:45:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 18:45:53 +0200 |
| commit | fd58bb71e22196c3c5e8d20b92bce6f343f1dea1 (patch) | |
| tree | 88b34c77a20d9e816edce51e9dcff47f6de526c8 /sql/item.h | |
| parent | 37d6d3b661315617953f1a8c5d53a2cb6558992e (diff) | |
| parent | e669e705a1a7d2bbdd42734cb9fc8349a5f2f118 (diff) | |
| download | mariadb-git-fd58bb71e22196c3c5e8d20b92bce6f343f1dea1.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 6bb97d3c3a3..8bb3aa33c78 100644 --- a/sql/item.h +++ b/sql/item.h @@ -147,6 +147,7 @@ bool mark_unsupported_function(const char *w1, const char *w2, #define NO_EXTRACTION_FL (1 << 6) #define FULL_EXTRACTION_FL (1 << 7) +#define SUBSTITUTION_FL (1 << 8) #define EXTRACTION_MASK (NO_EXTRACTION_FL | FULL_EXTRACTION_FL) extern const char *item_empty_name; @@ -5744,6 +5745,11 @@ public: return false; } table_map used_tables() const; + virtual void update_used_tables() + { + if (field && field->default_value) + field->default_value->expr->update_used_tables(); + } Field *get_tmp_table_field() { return 0; } Item *get_tmp_table_item(THD *thd) { return this; } Item_field *field_for_view_update() { return 0; } |