diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2021-06-16 14:16:26 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2021-06-16 14:25:13 +0400 |
| commit | 8dae7ee02f98e71e9352d73d1da235fd4128d076 (patch) | |
| tree | dbdf8489760cc50c2a9c186136e65c9fd8d49889 /sql/json_table.h | |
| parent | fe0dc6ba769dcb468b37a8c3e3c636c0049f7307 (diff) | |
| download | mariadb-git-bb-10.6-mdev17399-hf.tar.gz | |
MDEV-25822 JSON_TABLE: default values should allow non-string literals.bb-10.6-mdev17399-hf
Default values of other types handled.
Diffstat (limited to 'sql/json_table.h')
| -rw-r--r-- | sql/json_table.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/json_table.h b/sql/json_table.h index 4e188ff4ba7..42f5a0c0c71 100644 --- a/sql/json_table.h +++ b/sql/json_table.h @@ -140,7 +140,7 @@ public: { public: Json_table_column::enum_on_response m_response; - LEX_CSTRING m_default; + Item *m_default; int respond(Json_table_column *jc, Field *f, uint error_num); int print(const char *name, String *str) const; bool specified() const { return m_response != RESPONSE_NOT_SPECIFIED; } @@ -154,7 +154,6 @@ public: Create_field *m_field; Json_table_nested_path *m_nest; CHARSET_INFO *m_explicit_cs; - CHARSET_INFO *m_defaults_cs; void set(enum_type ctype) { |