diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-25 09:15:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-25 09:15:08 +0300 |
| commit | 3cc8539d84f569f4829874bf36f4b44b0ceb030c (patch) | |
| tree | cc4cf6561f81b4d6b33af1dc5da888e6baff59af /sql/sql_parse.h | |
| parent | 956d93b581b704fa56b0b6469ae35a2e79850ef4 (diff) | |
| parent | 1ace1075dc6bb02fe19802334f9d47446a17a79a (diff) | |
| download | mariadb-git-3cc8539d84f569f4829874bf36f4b44b0ceb030c.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'sql/sql_parse.h')
| -rw-r--r-- | sql/sql_parse.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_parse.h b/sql/sql_parse.h index 9e1ec6fabbc..d3cf83b6e08 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -78,7 +78,6 @@ bool check_string_char_length(const LEX_CSTRING *str, uint err_msg, size_t max_char_length, CHARSET_INFO *cs, bool no_error); bool check_ident_length(const LEX_CSTRING *ident); -CHARSET_INFO* merge_charset_and_collation(CHARSET_INFO *cs, CHARSET_INFO *cl); bool check_host_name(LEX_CSTRING *str); bool check_identifier_name(LEX_CSTRING *str, uint max_char_length, uint err_code, const char *param_for_err_msg); |