diff options
| author | unknown <jimw@rama.(none)> | 2006-09-28 18:11:29 -0700 |
|---|---|---|
| committer | unknown <jimw@rama.(none)> | 2006-09-28 18:11:29 -0700 |
| commit | 9afa051a12b9adc7285915621d0a127d670e9c21 (patch) | |
| tree | 1e61b6e0101239baef40aeb43e59feb46919c92e /sql/slave.cc | |
| parent | 1bb27aeab1f671ff313872be2cb7f1dfa0d92aea (diff) | |
| parent | 915bdfbea873dd064edc28905945f2f098bb83e2 (diff) | |
| download | mariadb-git-9afa051a12b9adc7285915621d0a127d670e9c21.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1-maint
into rama.(none):/home/jimw/my/mysql-4.1-clean
include/my_global.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/mysqld.cc:
Resolve conflict
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index bceeca1055c..e3bc2d75829 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4073,7 +4073,7 @@ static int connect_to_master(THD* thd, MYSQL* mysql, MASTER_INFO* mi, suppress_warnings= 0; sql_print_error("Slave I/O thread: error %s to master \ '%s@%s:%d': \ -Error: '%s' errno: %d retry-time: %d retries: %d", +Error: '%s' errno: %d retry-time: %d retries: %lu", (reconnect ? "reconnecting" : "connecting"), mi->user,mi->host,mi->port, mysql_error(mysql), last_errno, |