Merge lp://qastaging/~linuxjedi/drizzle/trunk-tx-log into lp://qastaging/drizzle/7.0
Proposed by
Andrew Hutchings
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Lee Bieber | ||||
| Approved revision: | 2151 | ||||
| Merged at revision: | 2158 | ||||
| Proposed branch: | lp://qastaging/~linuxjedi/drizzle/trunk-tx-log | ||||
| Merge into: | lp://qastaging/drizzle/7.0 | ||||
| Diff against target: |
1972 lines (+584/-372) 69 files modified
drizzled/drizzled.cc (+5/-3) drizzled/drizzled.h (+2/-0) drizzled/session.h (+0/-1) drizzled/sys_var.cc (+2/-2) drizzled/sys_var.h (+11/-0) drizzled/transaction_services.cc (+6/-6) plugin/information_schema_dictionary/tests/r/tables.result (+3/-0) plugin/innobase/dict/create_replication.cc (+151/-10) plugin/innobase/handler/ha_innodb.cc (+66/-4) plugin/innobase/handler/replication_dictionary.cc (+10/-5) plugin/innobase/include/create_replication.h (+10/-1) plugin/innobase/include/read_replication.h (+2/-0) plugin/innobase/include/srv0srv.h (+3/-0) plugin/innobase/include/sync0sync.h (+2/-0) plugin/innobase/include/trx0sys.h (+12/-54) plugin/innobase/include/trx0trx.h (+10/-0) plugin/innobase/include/trx0trx.ic (+11/-0) plugin/innobase/log/log0recv.cc (+0/-5) plugin/innobase/pars/pars0pars.cc (+6/-3) plugin/innobase/srv/srv0srv.cc (+11/-0) plugin/innobase/tests/r/innodb-system-table-view.result (+13/-6) plugin/innobase/tests/r/innodb_replication_log.result (+19/-0) plugin/innobase/tests/t/innodb_replication_log-master.opt (+1/-0) plugin/innobase/tests/t/innodb_replication_log.test (+14/-0) plugin/innobase/trx/trx0sys.cc (+20/-184) plugin/innobase/trx/trx0trx.cc (+10/-11) plugin/schema_dictionary/tests/r/data_dictionary.result (+35/-7) plugin/transaction_log/tests/t/alter-master.opt (+1/-1) plugin/transaction_log/tests/t/auto_commit-master.opt (+1/-1) plugin/transaction_log/tests/t/bad_replicator-master.opt (+1/-1) plugin/transaction_log/tests/t/blob-master.opt (+1/-1) plugin/transaction_log/tests/t/bug660779-master.opt (+1/-1) plugin/transaction_log/tests/t/create_select-master.opt (+1/-1) plugin/transaction_log/tests/t/create_table-master.opt (+1/-1) plugin/transaction_log/tests/t/insert_on_duplicate_update-master.opt (+1/-1) plugin/transaction_log/tests/t/insert_select-master.opt (+1/-1) plugin/transaction_log/tests/t/multi_column_primary_key-master.opt (+1/-1) plugin/transaction_log/tests/t/multi_table-master.opt (+1/-1) plugin/transaction_log/tests/t/no_modification-master.opt (+1/-1) plugin/transaction_log/tests/t/null_values-master.opt (+1/-1) plugin/transaction_log/tests/t/rand-master.opt (+1/-1) plugin/transaction_log/tests/t/rename-master.opt (+1/-1) plugin/transaction_log/tests/t/replace-master.opt (+1/-1) plugin/transaction_log/tests/t/rollback-master.opt (+1/-1) plugin/transaction_log/tests/t/savepoint-master.opt (+1/-1) plugin/transaction_log/tests/t/schema-master.opt (+1/-1) plugin/transaction_log/tests/t/select_for_update-master.opt (+1/-1) plugin/transaction_log/tests/t/slap-master.opt (+1/-1) plugin/transaction_log/tests/t/temp_tables-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_alter-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_create-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_data_type-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_delete-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_drop-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_large_blob-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_loaddata-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_replace-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_schema-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_transaction-master.opt (+1/-1) plugin/transaction_log/tests/t/transaction_log_update-master.opt (+1/-1) plugin/transaction_log/tests/t/truncate_log-master.opt (+1/-1) plugin/transaction_log/tests/t/udf_print_transaction_message-master.opt (+1/-1) plugin/transaction_log/tests/t/update-master.opt (+1/-1) plugin/transaction_log/tests/t/variables-master.opt (+1/-1) plugin/transaction_log/utilities/transaction_log_connection.cc (+6/-5) plugin/transaction_log/utilities/transaction_log_connection.h (+1/-1) plugin/transaction_log/utilities/transaction_reader.cc (+99/-27) tests/r/information_schema.result (+2/-0) tests/suite/regression/r/654219.result (+4/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~linuxjedi/drizzle/trunk-tx-log | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Shrewsbury (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
A combination of lp:~skinny.moey/drizzle/inno_seq_commit, lp:~linuxjedi/drizzle/trunk-bug-711068 and lp:~dshrews/drizzle/trxrdr_inno_repl_changes
Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having.
Also adds columns to the table and fixes the replication_reader tool.
Requires branch bug716502_perm_schema_filter to do any writes on SYS_REPLICATION
To post a comment you must log in.
Revision history for this message
| Andrew Hutchings (linuxjedi) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Awesome work.