lp:~skinny.moey/drizzle/server_uuid_repl

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development at revision 2299

Drizzle Merge Team: Pending requested 2011-04-30

Diff: 739 lines (+225/-32)

19 files modified

drizzled/drizzled.cc (+1/-0)
drizzled/execute.cc (+2/-0)
drizzled/main.cc (+19/-2)
drizzled/session.cc (+3/-0)
drizzled/session.h (+35/-0)
drizzled/sys_var.cc (+3/-0)
plugin/innobase/dict/create_replication.cc (+39/-4)
plugin/innobase/handler/ha_innodb.cc (+10/-1)
plugin/innobase/handler/replication_dictionary.cc (+6/-0)
plugin/innobase/include/create_replication.h (+6/-3)
plugin/innobase/include/read_replication.h (+2/-0)
plugin/innobase/tests/r/innodb-system-table-view.result (+6/-4)
plugin/innobase/tests/r/innodb_replication_log.result (+2/-0)
plugin/schema_dictionary/tests/r/data_dictionary.result (+17/-1)
plugin/slave/queue_consumer.cc (+33/-8)
plugin/slave/queue_consumer.h (+9/-1)
plugin/slave/queue_producer.cc (+11/-3)
plugin/slave/queue_producer.h (+2/-0)
plugin/slave/replication_schema.cc (+19/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2299. By Joe Daly on 2011-04-29

merge trunk

2298. By Joe Daly on 2011-04-29

test fixes

2297. By Joe Daly on 2011-04-29

fix size of uuid, and add uuid to system variables

2296. By Joe Daly on 2011-04-28

merge in fix for bug771572, and merge trunk

2295. By Joe Daly on 2011-04-27

slave fixes

2294. By Joe Daly on 2011-04-26

fix size problem

2293. By Joe Daly on 2011-04-26

slave plugin work

2292. By Joe Daly on 2011-04-26

server uuid as part of replication table

2291. By Joe Daly on 2011-04-25

Add server uuid

2290. By Brian Aker on 2011-04-23

Merge in refactor