lp://qastaging/~brianaker/drizzle/is-replicated

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/drizzle/7.0 at revision 2193

Drizzle Developers: Pending requested 2011-02-22

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2193. By Brian Aker on 2011-02-22

This fixes the message such that the table inherits the no replication
property from the schema.

2192. By Brian Aker on 2011-02-22

Merge in modifications such that we check both schema and table for
replication option.

2191. By Brian Aker on 2011-02-21

Merge in change from REPLICATION to REPLICATE as keyword.

2190. By Brian Aker on 2011-02-21

Simple encapsulation of Lex

2189. By Brian Aker on 2011-02-21

Sort the headers in cursor to find dependency

2188. By Brian Aker on 2011-02-21

Merge in sort/fix for header file discoverd.

2187. By Brian Aker on 2011-02-20

Brian Aker 2011-02-20 Merge in additional header bits for strerror_r
Brian Aker 2011-02-20 Create CONST on additional Field methods.
Brian Aker 2011-02-19 Further commit const on field.
Brian Aker 2011-02-18 This fixes DEBUG based compiles.
Brian Aker 2011-02-18 Protect all of the val_* methods from modification.

2186. By Lee Bieber on 2011-02-20

Merge Olaf - change List_iterator_fast to List<Item>::iterator

2185. By Lee Bieber on 2011-02-19

Merge Marisa - adds logo references to the include file
Merge Monty - some randome clean up stuff

2184. By Lee Bieber on 2011-02-19

Merge Brian - clarifies a number of parser ambiguity, and cleans up UPDATE and DELETE