diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-27 23:08:46 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-27 23:08:46 -0700 |
| commit | c5a8038661fc912198401777612a944cbdfb5f6c (patch) | |
| tree | 25d883bfa48bf9bee9aac26a3d512e024468f200 /sql/slave.cc | |
| parent | d95ec59726ad44cc26bee2e32c9bffa0052b0a51 (diff) | |
| download | mariadb-git-c5a8038661fc912198401777612a944cbdfb5f6c.tar.gz | |
pointer casts -> int4store()
added error code to master failed connect message
BitKeeper/etc/ignore:
Added libmysql_r/acconfig.h libmysql_r/array.c libmysql_r/bchange.c libmysql_r/bmove.c libmysql_r/bmove_upp.c libmysql_r/charset.c libmysql_r/conf_to_src.c libmysql_r/ctype_autoconf.c libmysql_r/ctype-big5.c libmysql_r/ctype.c libmysql_r/ctype-czech.c libmysql_r/ctype-euc_kr.c libmysql_r/ctype-gb2312.c libmysql_r/ctype-gbk.c libmysql_r/ctype-sjis.c libmysql_r/ctype-tis620.c libmysql_r/ctype-ujis.c libmysql_r/dbug.c libmysql_r/default.c libmysql_r/dll.c libmysql_r/errmsg.c libmysql_r/errors.c libmysql_r/getopt1.c libmysql_r/getopt.c libmysql_r/get_password.c libmysql_r/getvar.c libmysql_r/int2str.c libmysql_r/is_prefix.c libmysql_r/libmysql.c libmysql_r/list.c libmysql_r/llstr.c libmysql_r/longlong2str.c libmysql_r/mf_casecnv.c libmysql_r/mf_dirname.c libmysql_r/mf_fn_ext.c libmysql_r/mf_format.c libmysql_r/mf_loadpath.c libmysql_r/mf_pack.c libmysql_r/mf_path.c libmysql_r/mf_tempfile.c libmysql_r/mf_unixpath.c libmysql_r/mf_wcomp.c libmysql_r/mulalloc.c libmysql_r/my_alloc.c libmysql_r/my_compress.c libm
sql/share/romanian/errmsg.sys:
touched again
sql/slave.cc:
print error code on failed connects
sql/sql_base.cc:
use int4store() instead of direct ponter casts
libmysql_r/acconfig.h:
***MISSING WEAVE***
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index c969d7f11ae..830ea070293 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1161,9 +1161,8 @@ static void safe_connect(THD* thd, MYSQL* mysql, MASTER_INFO* mi) !mc_mysql_connect(mysql, mi->host, mi->user, mi->password, 0, mi->port, 0, 0)) { - sql_print_error( - "Slave thread: error connecting to master:%s, retry in %d sec", - mc_mysql_error(mysql), mi->connect_retry); + sql_print_error("Slave thread: error connecting to master:%s(%d),\ + retry in %d sec", mc_mysql_error(mysql), errno, mi->connect_retry); safe_sleep(thd, mi->connect_retry); } |