diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-15 22:59:07 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-15 22:59:07 +0300 |
| commit | 391b5246fef4110bc73227c67f77eec5611a612e (patch) | |
| tree | 43a14c6ad76010ee31038173e53da44517c84dbe /sql/mysql_priv.h | |
| parent | 92b1c2f3caafe6529a08992d7f134476c7b9ff70 (diff) | |
| parent | 27fca0ab1775a8c1dfe699c978b6448a7aa8f47b (diff) | |
| download | mariadb-git-391b5246fef4110bc73227c67f77eec5611a612e.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index f90ded07599..1a171705dae 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -880,6 +880,8 @@ bool check_string_char_length(LEX_STRING *str, const char *err_msg, bool no_error); bool check_host_name(LEX_STRING *str); +CHARSET_INFO *merge_charset_and_collation(CHARSET_INFO *cs, CHARSET_INFO *cl); + bool parse_sql(THD *thd, Parser_state *parser_state, Object_creation_ctx *creation_ctx); |