← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_repl.cc

  • Committer: Brian Aker
  • Date: 2008-08-05 04:10:42 UTC
  • mfrom: (261.2.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: brian@tangent.org-20080805041042-1l4893r3bwy2lxz2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_repl.cc
211
211
    if ((linfo = tmp->current_linfo))
212
212
    {
213
213
      pthread_mutex_lock(&linfo->lock);
214
 
      result = !memcmp((uchar*) log_name, (uchar*) linfo->log_file_name,
215
 
                     log_name_len);
 
214
      result = !memcmp(log_name, linfo->log_file_name, log_name_len);
216
215
      pthread_mutex_unlock(&linfo->lock);
217
216
      if (result)
218
217
        break;
393
392
  pthread_mutex_t *log_lock;
394
393
  bool binlog_can_be_corrupted= false;
395
394
 
396
 
  memset((char*) &log, 0, sizeof(log));
 
395
  memset(&log, 0, sizeof(log));
397
396
  /* 
398
397
     heartbeat_period from @master_heartbeat_period user variable
399
398
  */
912
911
 
913
912
          /* Issuing warning then started without --skip-slave-start */
914
913
          if (!opt_skip_slave_start)
915
 
            push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
914
            push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
916
915
                         ER_MISSING_SKIP_SLAVE,
917
916
                         ER(ER_MISSING_SKIP_SLAVE));
918
917
        }
920
919
        pthread_mutex_unlock(&mi->rli.data_lock);
921
920
      }
922
921
      else if (thd->lex->mi.pos || thd->lex->mi.relay_log_pos)
923
 
        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_UNTIL_COND_IGNORED,
 
922
        push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE, ER_UNTIL_COND_IGNORED,
924
923
                     ER(ER_UNTIL_COND_IGNORED));
925
924
 
926
925
      if (!slave_errno)
936
935
  else
937
936
  {
938
937
    /* no error if all threads are already started, only a warning */
939
 
    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_SLAVE_WAS_RUNNING,
 
938
    push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE, ER_SLAVE_WAS_RUNNING,
940
939
                 ER(ER_SLAVE_WAS_RUNNING));
941
940
  }
942
941
 
984
983
  {
985
984
    //no error if both threads are already stopped, only a warning
986
985
    slave_errno= 0;
987
 
    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_SLAVE_WAS_NOT_RUNNING,
 
986
    push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE, ER_SLAVE_WAS_NOT_RUNNING,
988
987
                 ER(ER_SLAVE_WAS_NOT_RUNNING));
989
988
  }
990
989
  unlock_slave_threads(mi);
1211
1210
  if (lex_mi->ssl || lex_mi->ssl_ca || lex_mi->ssl_capath ||
1212
1211
      lex_mi->ssl_cert || lex_mi->ssl_cipher || lex_mi->ssl_key ||
1213
1212
      lex_mi->ssl_verify_server_cert )
1214
 
    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
1213
    push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
1215
1214
                 ER_SLAVE_IGNORED_SSL_PARAMS, ER(ER_SLAVE_IGNORED_SSL_PARAMS));
1216
1215
 
1217
1216
  if (lex_mi->relay_log_name)
1713
1712
#ifdef HAVE_REPLICATION
1714
1713
  pthread_mutex_lock(&LOCK_active_mi);
1715
1714
  if (active_mi && slave_net_timeout < active_mi->heartbeat_period)
1716
 
    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
1715
    push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1717
1716
                        ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE,
1718
1717
                        "The currect value for master_heartbeat_period"
1719
1718
                        " exceeds the new value of `slave_net_timeout' sec."