← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.cc

  • Committer: Brian Aker
  • Date: 2008-10-15 06:44:44 UTC
  • mfrom: (512.1.21 drizzle-stew)
  • Revision ID: brian@tangent.org-20081015064444-p5ccnpyz558oaquy
Merging Stewart's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
741
741
  if (io_slave_killed(thd, mi))
742
742
  {
743
743
    if (info && global_system_variables.log_warnings)
744
 
      sql_print_information(info);
 
744
      sql_print_information("%s",info);
745
745
    return true;
746
746
  }
747
747
  return false;
1013
1013
err:
1014
1014
  if (err_msg.length() != 0)
1015
1015
  {
1016
 
    sql_print_error(err_msg.ptr());
 
1016
    sql_print_error("%s",err_msg.ptr());
1017
1017
    assert(err_code != 0);
1018
 
    mi->report(ERROR_LEVEL, err_code, err_msg.ptr());
 
1018
    mi->report(ERROR_LEVEL, err_code, "%s",err_msg.ptr());
1019
1019
    return(1);
1020
1020
  }
1021
1021
 
1901
1901
    }
1902
1902
    else
1903
1903
    {
1904
 
      sql_print_information(buf);
 
1904
      sql_print_information("%s",buf);
1905
1905
    }
1906
1906
  }
1907
1907
  if (safe_reconnect(thd, drizzle, mi, 1) || io_slave_killed(thd, mi))
1908
1908
  {
1909
1909
    if (global_system_variables.log_warnings)
1910
 
      sql_print_information(_(messages[SLAVE_RECON_MSG_KILLED_AFTER]));
 
1910
      sql_print_information("%s",_(messages[SLAVE_RECON_MSG_KILLED_AFTER]));
1911
1911
    return 1;
1912
1912
  }
1913
1913
  return 0;
2353
2353
 
2354
2354
          if (last_errno == 0)
2355
2355
          {
2356
 
            rli->report(ERROR_LEVEL, thd->main_da.sql_errno(), errmsg);
 
2356
            rli->report(ERROR_LEVEL, thd->main_da.sql_errno(), "%s", errmsg);
2357
2357
          }
2358
2358
          else if (last_errno != thd->main_da.sql_errno())
2359
2359
          {