← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_repl.cc

  • Committer: Felipe
  • Date: 2008-08-04 23:58:04 UTC
  • mto: (261.2.6 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: felipe@pena-20080804235804-x55q2xqxcar6u66f
- Renamed MYSQL_ERROR to DRIZZLE_ERROR.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_repl.cc
911
911
 
912
912
          /* Issuing warning then started without --skip-slave-start */
913
913
          if (!opt_skip_slave_start)
914
 
            push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
914
            push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
915
915
                         ER_MISSING_SKIP_SLAVE,
916
916
                         ER(ER_MISSING_SKIP_SLAVE));
917
917
        }
919
919
        pthread_mutex_unlock(&mi->rli.data_lock);
920
920
      }
921
921
      else if (thd->lex->mi.pos || thd->lex->mi.relay_log_pos)
922
 
        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,
923
923
                     ER(ER_UNTIL_COND_IGNORED));
924
924
 
925
925
      if (!slave_errno)
935
935
  else
936
936
  {
937
937
    /* no error if all threads are already started, only a warning */
938
 
    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,
939
939
                 ER(ER_SLAVE_WAS_RUNNING));
940
940
  }
941
941
 
983
983
  {
984
984
    //no error if both threads are already stopped, only a warning
985
985
    slave_errno= 0;
986
 
    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,
987
987
                 ER(ER_SLAVE_WAS_NOT_RUNNING));
988
988
  }
989
989
  unlock_slave_threads(mi);
1210
1210
  if (lex_mi->ssl || lex_mi->ssl_ca || lex_mi->ssl_capath ||
1211
1211
      lex_mi->ssl_cert || lex_mi->ssl_cipher || lex_mi->ssl_key ||
1212
1212
      lex_mi->ssl_verify_server_cert )
1213
 
    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
1213
    push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
1214
1214
                 ER_SLAVE_IGNORED_SSL_PARAMS, ER(ER_SLAVE_IGNORED_SSL_PARAMS));
1215
1215
 
1216
1216
  if (lex_mi->relay_log_name)
1712
1712
#ifdef HAVE_REPLICATION
1713
1713
  pthread_mutex_lock(&LOCK_active_mi);
1714
1714
  if (active_mi && slave_net_timeout < active_mi->heartbeat_period)
1715
 
    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
1715
    push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1716
1716
                        ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE,
1717
1717
                        "The currect value for master_heartbeat_period"
1718
1718
                        " exceeds the new value of `slave_net_timeout' sec."