Merge lp://qastaging/~brianaker/drizzle/is-replicated into lp://qastaging/drizzle/7.0
Proposed by
Brian Aker
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | 2193 |
| Merged at revision: | 2193 |
| Proposed branch: | lp://qastaging/~brianaker/drizzle/is-replicated |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
1482 lines (+315/-143) (has conflicts) 52 files modified
.bzrignore (+3/-0) drizzled/definitions.h (+5/-6) drizzled/message.h (+29/-0) drizzled/message/replication_options.proto (+2/-2) drizzled/message/schema.h (+1/-0) drizzled/message/statement_transform.cc (+17/-8) drizzled/parser.cc (+1/-2) drizzled/plugin/schema_engine.cc (+2/-1) drizzled/plugin/table_function.cc (+1/-2) drizzled/sql_yacc.yy (+5/-4) drizzled/symbol_hash.gperf (+1/-0) drizzled/table/concurrent.cc (+1/-3) drizzled/table/instance/base.h (+1/-1) drizzled/table/instance/shared.cc (+38/-3) drizzled/table/instance/shared.h (+4/-7) drizzled/table_proto.h (+2/-1) drizzled/table_proto_write.cc (+14/-4) drizzled/transaction_services.cc (+11/-11) plugin/collation_dictionary/tests/r/data_dictionary.result (+2/-2) plugin/function_engine/function.cc (+2/-2) plugin/information_schema_dictionary/tests/r/show_create_table.result (+20/-20) plugin/innobase/tests/r/innodb_cmp.result (+1/-1) plugin/innobase/tests/r/innodb_cmp_reset.result (+1/-1) plugin/innobase/tests/r/innodb_cmpmem.result (+1/-1) plugin/innobase/tests/r/innodb_cmpmem_reset.result (+1/-1) plugin/innobase/tests/r/innodb_lock_waits.result (+1/-1) plugin/innobase/tests/r/innodb_locks.result (+1/-1) plugin/innobase/tests/r/innodb_replication_log.result (+1/-1) plugin/innobase/tests/r/innodb_status.result (+1/-1) plugin/innobase/tests/r/innodb_trx.result (+1/-1) plugin/logging_stats/tests/r/command.result (+1/-1) plugin/logging_stats/tests/r/max_user.result (+1/-1) plugin/mysql_protocol/net_serv.cc (+7/-5) plugin/registry_dictionary/tests/r/data_dictionary.result (+2/-2) plugin/replication_dictionary/tests/r/data_dictionary.result (+1/-1) plugin/schema_dictionary/schemas.cc (+5/-0) plugin/schema_dictionary/tables.cc (+4/-0) plugin/schema_dictionary/tests/r/data_dictionary.result (+19/-9) plugin/session_dictionary/tests/r/data_dictionary.result (+1/-1) plugin/show_dictionary/show_create_schema.cc (+2/-6) plugin/status_dictionary/tests/r/data_dictionary.result (+4/-4) plugin/table_cache_dictionary/tests/r/table_cache.result (+1/-1) plugin/table_cache_dictionary/tests/r/table_definition_cache.result (+1/-1) tests/r/create.result (+2/-2) tests/r/data_dictionary_like_info.result (+3/-3) tests/r/drizzledump_restore.result (+2/-2) tests/r/replication_schema_ddl.result (+50/-6) tests/r/replication_table_ddl.result (+3/-3) tests/t/drizzledump_restore.test (+2/-2) tests/t/errors.test (+1/-1) tests/t/replication_schema_ddl.test (+30/-2) tests/t/replication_table_ddl.test (+2/-2) Text conflict in drizzled/message/statement_transform.cc |
| To merge this branch: | bzr merge lp://qastaging/~brianaker/drizzle/is-replicated |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Fixes up a number of the issues around is_replicated
To post a comment you must log in.
Revision history for this message
| Olaf van der Spek (olafvdspek) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
> template<class T> inline bool is_replicated(const T*& ptr)
Shouldn't pointers be passed by value instead of const&?
The inline keyword probably doesn't matter on template functions.