~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/slave.cc

  • Committer: Brian Aker
  • Date: 2008-07-11 17:17:17 UTC
  • mfrom: (77.1.79 codestyle)
  • Revision ID: brian@tangent.org-20080711171717-039qp03g93w70rlq
MergeĀ 

Show diffs side-by-side

added added

removed removed

Lines of Context:
1512
1512
    return(packet_error);
1513
1513
 
1514
1514
  len = cli_safe_read(mysql);
1515
 
  if (len == packet_error || (long) len < 1)
 
1515
  if (len == packet_error || (int32_t) len < 1)
1516
1516
  {
1517
1517
    if (mysql_errno(mysql) == ER_NET_READ_INTERRUPTED)
1518
1518
    {
3161
3161
      suppress_warnings= 0;
3162
3162
      mi->report(ERROR_LEVEL, last_errno,
3163
3163
                 "error %s to master '%s@%s:%d'"
3164
 
                 " - retry-time: %d  retries: %lu",
 
3164
                 " - retry-time: %d  retries: %u",
3165
3165
                 (reconnect ? "reconnecting" : "connecting"),
3166
3166
                 mi->user, mi->host, mi->port,
3167
3167
                 mi->connect_retry, master_retry_count);