← Back to branch summary

~ubuntu-branches/ubuntu/hardy/mysql-dfsg-5.0/hardy-updates

« back to all changes in this revision

Viewing changes to sql/repl_failsafe.cc

  • Committer: Bazaar Package Importer
  • Author(s): sean finney
  • Date: 2007-05-13 12:32:45 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20070513123245-8c3l187dk34cz2ar
Tags: 5.0.41-2
the previous "translation changes" inadvertently introduced unrelated
changes in the package control file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/repl_failsafe.cc
92
92
  if (thd->variables.max_join_size == HA_POS_ERROR)
93
93
    thd->options|= OPTION_BIG_SELECTS;
94
94
 
95
 
  thd->proc_info="Thread initialized";
 
95
  thd_proc_info(thd, "Thread initialized");
96
96
  thd->version=refresh_version;
97
97
  thd->set_time();
98
98
  DBUG_RETURN(0);
600
600
  {
601
601
    bool break_req_chain = 0;
602
602
    pthread_cond_wait(&COND_rpl_status, &LOCK_rpl_status);
603
 
    thd->proc_info="Processing request";
 
603
    thd_proc_info(thd, "Processing request");
604
604
    while (!break_req_chain)
605
605
    {
606
606
      switch (rpl_status) {
944
944
      goto err;
945
945
    }
946
946
  }
947
 
  thd->proc_info="purging old relay logs";
 
947
  thd_proc_info(thd, "purging old relay logs");
948
948
  if (purge_relay_logs(&active_mi->rli,thd,
949
949
                       0 /* not only reset, but also reinit */,
950
950
                       &errmsg))
971
971
  flush_relay_log_info(&active_mi->rli);
972
972
  pthread_cond_broadcast(&active_mi->rli.data_cond);
973
973
  pthread_mutex_unlock(&active_mi->rli.data_lock);
974
 
  thd->proc_info = "starting slave";
 
974
  thd_proc_info(thd, "starting slave");
975
975
  if (restart_thread_mask)
976
976
  {
977
977
    error=start_slave_threads(0 /* mutex not needed */,
983
983
err:
984
984
  unlock_slave_threads(active_mi);
985
985
  pthread_mutex_unlock(&LOCK_active_mi);
986
 
  thd->proc_info = 0;
 
986
  thd_proc_info(thd, 0);
987
987
 
988
988
  mysql_close(&mysql); // safe to call since we always do mysql_init()
989
989
  if (!error)