~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/slave.cc

Removed my_vsnprintf and my_snprintf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1167
1167
    else if (!check_io_slave_killed(mi->io_thd, mi, NULL))
1168
1168
    {
1169
1169
      char buf[256];
1170
 
      my_snprintf(buf, sizeof(buf), "%s (Errno: %d)", mysql_error(mysql), 
1171
 
                  mysql_errno(mysql));
 
1170
      snprintf(buf, sizeof(buf), "%s (Errno: %d)", mysql_error(mysql), 
 
1171
               mysql_errno(mysql));
1172
1172
      mi->report(ERROR_LEVEL, ER_SLAVE_MASTER_COM_FAILURE,
1173
1173
                 ER(ER_SLAVE_MASTER_COM_FAILURE), "COM_REGISTER_SLAVE", buf);
1174
1174
    }
2036
2036
  if (!suppress_warnings) 
2037
2037
  {
2038
2038
    char buf[256], llbuff[22];
2039
 
    my_snprintf(buf, sizeof(buf), messages[SLAVE_RECON_MSG_FAILED], 
2040
 
                IO_RPL_LOG_NAME, llstr(mi->master_log_pos, llbuff));
 
2039
    snprintf(buf, sizeof(buf), messages[SLAVE_RECON_MSG_FAILED], 
 
2040
             IO_RPL_LOG_NAME, llstr(mi->master_log_pos, llbuff));
2041
2041
    /* 
2042
2042
      Raise a warining during registering on master/requesting dump.
2043
2043
      Log a message reading event.