diff options
| author | unknown <hf@deer.(none)> | 2003-06-03 15:02:57 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-03 15:02:57 +0500 |
| commit | aed6de39b6129d84f091e23b4a8b0f5cc8e6076d (patch) | |
| tree | 52e689b118c79c0b3706dafc28ecf72060fa9844 /sql/repl_failsafe.cc | |
| parent | 62c7d2cd2711d3ab2b7d0adba2947b38168cc4b3 (diff) | |
| download | mariadb-git-aed6de39b6129d84f091e23b4a8b0f5cc8e6076d.tar.gz | |
SCRUM:
splittiln common client's parts
include/sql_common.h:
superfluous #ifdef-s removed
libmysql/client_settings.h:
superfluous #ifdef-s removed
libmysql/libmysql.c:
some litter removed
libmysqld/lib_sql.cc:
here we had wrong parameters
mysys/default.c:
this is not needed anymore - calling code fixed
sql-common/client.c:
code trimmed and simplified
sql/client_settings.h:
code trimmed
sql/repl_failsafe.cc:
option's initialization added
sql/slave.cc:
option's initialization added
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 2aa8f492ed3..bbfd7866aa2 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -669,6 +669,7 @@ int connect_to_master(THD *thd, MYSQL* mysql, MASTER_INFO* mi) DBUG_RETURN(1); } mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (char *)&slave_net_timeout); + mysql_options(mysql, MYSQL_SET_CHARSET_NAME, (char *)default_charset_info); if (!mysql_real_connect(mysql, mi->host, mi->user, mi->password, 0, mi->port, 0, 0)) DBUG_RETURN(1); |