← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

Viewing all changes in revision 2361.

Committer: Mark Atwood
Date: 2011-07-07 02:21:06 UTC
mfrom: (2360.1.1 drizzle)
Revision ID: me@mark.atwood.name-20110707022106-cnzmj4jjz8qvwqst

merge lp:~fallenpegasus/drizzle/multimaster

files modified:
plugin/slave/module.cc

plugin/slave/queue_consumer.cc

plugin/slave/queue_consumer.h

plugin/slave/queue_producer.cc

plugin/slave/queue_producer.h

plugin/slave/replication_schema.cc

plugin/slave/replication_schema.h

plugin/slave/replication_slave.cc

plugin/slave/replication_slave.h

tests/lib/server_mgmt/drizzled.py

Show diffs side-by-side

added added

removed removed

plugin/slave/module.cc

plugin/slave/queue_consumer.cc

plugin/slave/queue_consumer.h

plugin/slave/queue_producer.cc

plugin/slave/queue_producer.h

plugin/slave/replication_schema.cc

plugin/slave/replication_schema.h

plugin/slave/replication_slave.cc

plugin/slave/replication_slave.h

tests/lib/server_mgmt/drizzled.py

Older »