lp://staging/~daniel-nichter/drizzle/fix-slave-reconnect-bug-956200

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/drizzle

David Shrewsbury (community): Disapprove on 2012-05-01

Drizzle Trunk: Pending requested 2012-04-29

Diff: 267 lines (+84/-65)

3 files modified

plugin/slave/queue_producer.cc (+55/-41)
plugin/slave/queue_producer.h (+2/-2)
plugin/slave/replication_slave.cc (+27/-22)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #956200: slave config file option max-reconnects doesn't work	Medium	Fix Committed
Bug #956214: slave doesn't set status to STOPPED after max-reconnect failures	Undecided	Fix Committed

Link a bug report

Related blueprints

2552. By Daniel Nichter on 2012-05-06

Add extra IO thread states: INITIALIZING, DISCONNECTED, RECONNECTING, CONNECTING, OK, STOPPED, ERROR. Change setIOState() params. Use C++ str instead of C str for err msg.

2551. By Daniel Nichter on 2012-04-29

Make status=STOPPED until IO thread connects. Set error_msg if all reconnects fail.

2550. By Daniel Nichter on 2012-04-29

Fix max-reconnects. Make seconds-between-reconnects and io-thread-sleep per-master options.

2549. By Drizzle Continuous Integration on 2012-04-25

modified:
  plugin/rabbitmq/rabbitmq_log.cc
pending merge tips: (use -v to see all merge revisions)
  Continuous Integr... 2012-04-24 modified:

2548. By Drizzle Continuous Integration on 2012-04-24

modified:
  drizzled/drizzled.cc
  drizzled/execute/scanner.l
pending merge tips: (use -v to see all merge revisions)
  Continuous Integr... 2012-04-21 [merge] modified:

2547. By Drizzle Continuous Integration on 2012-04-23

modified:
  client/conclusions.h
  client/drizzledump.cc
  client/drizzledump_data.h
  client/drizzledump_drizzle.cc
  client/drizzledump_mysql.cc
  client/drizzleimport.cc
  client/include.am
  client/option_string.h
  client/server_detect.cc
  client/statement.h
  client/stats.h
  client/thread_context.h
  drizzled/identifier/catalog.cc
  drizzled/identifier/constants/schema.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/table.cc
  drizzled/include.am
  drizzled/main.cc
  plugin/innobase/dict/dict0dict.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/innobase/plugin.am
  plugin/innobase/tests/r/innodb-system-table-view.result
  plugin/tableprototester/tableprototester.cc
  tests/r/broken_table_proto_file.result
  unittests/include.am
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-23 Update to add in dependency for unittest

2546. By Drizzle Continuous Integration on 2012-04-21

modified:
  plugin/regex_policy/module.cc
  plugin/regex_policy/policy.h
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-04-08 Refactor

2545. By Drizzle Continuous Integration on 2012-04-21

added:
  tests/suite/regression/r/986455.result
  tests/suite/regression/t/986455.test
modified:
  .bzrignore
  drizzled/drizzled.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/schema.h
  drizzled/identifier/table.cc
  drizzled/identifier/table.h
  drizzled/table/instance/base.cc
  drizzled/util/backtrace.cc
  drizzled/util/backtrace.h
  libdrizzle-1.0/t/drizzle_con_st.c
  libdrizzle/conn.cc
  plugin/mysql_unix_socket_protocol/protocol.cc
  plugin/slave/queue_producer.cc
pending merge tips: (use -v to see all merge revisions)
  Continuous Integr... 2012-04-20 [merge] added:

2544. By Drizzle Continuous Integration on 2012-04-20

modified:
  tests/test-run.pl
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-07 Update test-run.pl for valgrind.

2543. By Drizzle Continuous Integration on 2012-04-19

modified:
  drizzled/execute/parser.yy
  drizzled/util/find_ptr.h
  plugin/user_locks/barriers.cc
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-04-07 Improve find_ptr