diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-10 22:27:28 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-10 22:27:28 +0300 |
| commit | c323c2d8bf219a00e08956d9f95dcc9ebbed21ef (patch) | |
| tree | de6f79f57aac8317ab35e980b3c3dcf36c5d6808 /sql/mysql_priv.h | |
| parent | 9b0e649a2ca37e7ac6a17e12e130b9162687f660 (diff) | |
| parent | 26e2802cf083946dba756b437715e42f432d9041 (diff) | |
| download | mariadb-git-c323c2d8bf219a00e08956d9f95dcc9ebbed21ef.tar.gz | |
Auto-merge from mysql-next-mr-bugfixing.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 232bc14afc3..bed60aaa494 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); @@ -988,8 +990,8 @@ struct Query_cache_query_flags #define query_cache_is_cacheable_query(L) 0 #endif /*HAVE_QUERY_CACHE*/ -void write_bin_log(THD *thd, bool clear_error, - char const *query, ulong query_length); +int write_bin_log(THD *thd, bool clear_error, + char const *query, ulong query_length); /* sql_connect.cc */ int check_user(THD *thd, enum enum_server_command command, |