lp:~jaypipes/drizzle/replication-ddl

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development

Brian Aker: Needs Fixing on 2010-04-01

Jay Pipes (community): Needs Resubmitting on 2010-04-01

Monty Taylor: Needs Fixing on 2010-03-31

Diff: 2587 lines (+894/-424)

49 files modified

drizzled/atomic/gcc_traits.h (+11/-10)
drizzled/atomic/pthread_traits.h (+20/-8)
drizzled/atomic/sun_studio.h (+152/-29)
drizzled/atomics.h (+16/-11)
drizzled/cursor.cc (+1/-4)
drizzled/include.am (+1/-0)
drizzled/plugin/replication.h (+46/-0)
drizzled/plugin/transaction_applier.h (+7/-2)
drizzled/plugin/transaction_replicator.h (+8/-4)
drizzled/replication_services.cc (+20/-13)
drizzled/replication_services.h (+4/-1)
drizzled/session.cc (+5/-5)
drizzled/set_var.cc (+1/-1)
drizzled/sql_delete.cc (+1/-1)
drizzled/sql_insert.cc (+2/-2)
drizzled/sql_parse.cc (+1/-1)
drizzled/sql_table.cc (+3/-3)
drizzled/sql_update.cc (+1/-1)
drizzled/statement/alter_table.cc (+3/-3)
drizzled/statement/release_savepoint.cc (+1/-1)
drizzled/statement/rollback_to_savepoint.cc (+2/-2)
drizzled/statement/savepoint.cc (+2/-2)
drizzled/transaction_services.cc (+47/-145)
drizzled/transaction_services.h (+40/-10)
plugin/default_replicator/default_replicator.cc (+5/-2)
plugin/default_replicator/default_replicator.h (+6/-1)
plugin/filtered_replicator/filtered_replicator.cc (+6/-3)
plugin/filtered_replicator/filtered_replicator.h (+6/-2)
plugin/innobase/handler/ha_innodb.cc (+0/-30)
plugin/transaction_log/module.cc (+26/-4)
plugin/transaction_log/plugin.ini (+2/-2)
plugin/transaction_log/tests/r/ddl_transaction_id.result (+36/-0)
plugin/transaction_log/tests/r/filtered_replicator.result (+4/-0)
plugin/transaction_log/tests/r/information_schema.result (+8/-5)
plugin/transaction_log/tests/r/insert.result (+4/-0)
plugin/transaction_log/tests/r/truncate_log.result (+2/-1)
plugin/transaction_log/tests/r/udf_print_transaction_message.result (+1/-0)
plugin/transaction_log/tests/r/variables.result (+2/-1)
plugin/transaction_log/tests/t/ddl_transaction_id-master.opt (+1/-0)
plugin/transaction_log/tests/t/ddl_transaction_id.inc (+29/-0)
plugin/transaction_log/tests/t/ddl_transaction_id.test (+14/-0)
plugin/transaction_log/tests/t/information_schema.test (+2/-2)
plugin/transaction_log/tests/t/insert.inc (+2/-0)
plugin/transaction_log/transaction_log.cc (+83/-32)
plugin/transaction_log/transaction_log.h (+32/-5)
plugin/transaction_log/transaction_log_applier.cc (+47/-72)
plugin/transaction_log/transaction_log_applier.h (+20/-3)
plugin/transaction_log/write_buffer.cc (+71/-0)
plugin/transaction_log/write_buffer.h (+90/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1427. By Jay Pipes <jpipes@serialcoder> on 2010-04-06

Try another const_cast<> technique on pthread_traits.

1426. By Jay Pipes <jpipes@serialcoder> on 2010-04-05

Merge trunk

1425. By Jay Pipes <jpipes@serialcoder> on 2010-04-02

merge replication-api

1424. By Jay Pipes <jpipes@serialcoder> on 2010-04-02

merge trunk

1423. By Jay Pipes <jpipes@serialcoder> on 2010-04-01

Fix cpplint header guard.

1422. By Jay Pipes <jpipes@serialcoder> on 2010-04-01

Merge trunk

1421. By Jay Pipes <jpipes@serialcoder> on 2010-04-01

OK, Sun Studio still didn't like that...seems to think that inline means something different than other compilers think it is...

1420. By Jay Pipes <jpipes@serialcoder> on 2010-04-01

Sun Studio says inlined functions must be defined before being called...

1419. By Jay Pipes <jpipes@serialcoder> on 2010-04-01

Add Solaris atomics fixes and test files. Add replication.h header to makefile.

1418. By Jay Pipes <jpipes@serialcoder> on 2010-03-31

* Fixes drizzled's atomics:

- fetch_and_add() was actually add_and_fetch() - fixed to have both methods correct
- compare_and_swap() was incorrect for all traits classes. Fixed to return a bool
true only when the supplied value is actually swapped
- fixes increment() and decrement() methods and operator+=() in outer atomics class
template to call proper add_and_fetch() methods on traits classes
- Now that above are fixed, removed the hacks in Query_id and TransactionLog to
have query ID and the new transactoin ID start properly at 1.

* Transaction messages sent over replication stream now use
a real transaction ID, managed by drizzled::TransactionServices. Previously,
the Query_id was being used, resulting in SELECT statements incrementing the
transaction ID.

* Added a test case to ensure that DDL ops are given a transaction ID and SELECT
ops do not increment the transaction ID.

The transaction ID will be paired with a channel ID to become the global
transaction identifier. ReplicationServices will manage the pairing of
channel and transaction ID and understand how far a particular subscriber
node has applied.