diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-02-15 20:31:24 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-02-15 20:31:58 +0100 |
| commit | 28f18aa7a6bb0da125f0ba3cb9da3720fa620501 (patch) | |
| tree | 1b26e15e88c898170859d724b8afbe4b2a63f09b /sql/sql_lex.h | |
| parent | a44f2c3ee88783a0f7fa535124a91a013860b021 (diff) | |
| parent | 62c0ac2da66f8e26d5bbf79f3a7dac56cad34f5e (diff) | |
| download | mariadb-git-bb-10.4-mdev16188.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev16188bb-10.4-mdev16188
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index fc451b21816..3f3fef8a414 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -148,7 +148,7 @@ public: bool copy_or_convert(THD *thd, const Lex_ident_cli_st *str, CHARSET_INFO *cs); bool is_null() const { return str == NULL; } bool to_size_number(ulonglong *to) const; - void set_valid_utf8(LEX_CSTRING *name) + void set_valid_utf8(const LEX_CSTRING *name) { DBUG_ASSERT(Well_formed_prefix(system_charset_info, name->str, name->length).length() == name->length); @@ -4640,6 +4640,5 @@ Item* handle_sql2003_note184_exception(THD *thd, Item* left, bool equal, void sp_create_assignment_lex(THD *thd, bool no_lookahead); bool sp_create_assignment_instr(THD *thd, bool no_lookahead); -Virtual_column_info *make_json_valid_expr(THD *thd, LEX_CSTRING *field_name); #endif /* MYSQL_SERVER */ #endif /* SQL_LEX_INCLUDED */ |