summaryrefslogtreecommitdiff
path: root/sql/sql_connect.h
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@dator8>2011-03-04 12:35:24 +0100
committerMikael Ronstrom <mikael@dator8>2011-03-04 12:35:24 +0100
commit0fc7078e53eb2b34503ddd2408844c2fa06d393f (patch)
treebccbd7ab21bb499f9f924e6f90e9303f3018d1ae /sql/sql_connect.h
parent23296fdc18e864b1b016b4c6a47723b26480f9c6 (diff)
parenta4711099716c53490a69c3c17a8b61a4a3282b19 (diff)
downloadmariadb-git-0fc7078e53eb2b34503ddd2408844c2fa06d393f.tar.gz
merge
Diffstat (limited to 'sql/sql_connect.h')
-rw-r--r--sql/sql_connect.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_connect.h b/sql/sql_connect.h
index c0cb100c779..1b71d95323d 100644
--- a/sql/sql_connect.h
+++ b/sql/sql_connect.h
@@ -33,7 +33,7 @@ void reset_mqh(LEX_USER *lu, bool get_them);
bool check_mqh(THD *thd, uint check_command);
void time_out_user_resource_limits(THD *thd, USER_CONN *uc);
void decrease_user_connections(USER_CONN *uc);
-void thd_init_client_charset(THD *thd, uint cs_number);
+bool thd_init_client_charset(THD *thd, uint cs_number);
bool setup_connection_thread_globals(THD *thd);
bool thd_prepare_connection(THD *thd);
bool thd_is_connection_alive(THD *thd);