lp://staging/~stewart/drizzle/schema-identifier-has-catalog

Branch merges

Propose for merging

1 branch dependent on this one.

On hold for merging into lp://staging/~drizzle-trunk/drizzle/development

Drizzle Merge Team: Pending requested 2012-01-05

Diff: 1297 lines (+273/-107)

41 files modified

drizzled/catalog/instance.h (+14/-3)
drizzled/cursor.cc (+1/-1)
drizzled/identifier/constants/schema.cc (+4/-1)
drizzled/identifier/schema.cc (+3/-2)
drizzled/identifier/schema.h (+1/-1)
drizzled/identifier/table.cc (+2/-1)
drizzled/identifier/table.h (+11/-9)
drizzled/locking/global.cc (+4/-1)
drizzled/plugin/storage_engine.cc (+5/-3)
drizzled/plugin/table_function.h (+4/-1)
drizzled/schema.cc (+5/-3)
drizzled/session.cc (+2/-2)
drizzled/show.cc (+14/-5)
drizzled/sql_base.cc (+18/-7)
drizzled/sql_load.cc (+2/-1)
drizzled/sql_parse.cc (+2/-2)
drizzled/sql_table.cc (+16/-9)
drizzled/sql_table.h (+1/-1)
drizzled/statement/alter_schema.cc (+5/-2)
drizzled/statement/alter_table.cc (+27/-12)
drizzled/statement/change_schema.cc (+3/-1)
drizzled/statement/create_index.cc (+14/-4)
drizzled/statement/create_schema.cc (+3/-1)
drizzled/statement/create_table.cc (+5/-2)
drizzled/statement/drop_index.cc (+14/-4)
drizzled/statement/drop_schema.cc (+3/-1)
drizzled/statement/rename_table.cc (+7/-2)
drizzled/table/concurrent.cc (+5/-1)
drizzled/table/instance/base.cc (+4/-1)
drizzled/table/instance/base.h (+5/-0)
drizzled/table/singular.cc (+2/-4)
plugin/innobase/handler/ha_innodb.cc (+5/-2)
plugin/memory/ha_heap.cc (+1/-3)
plugin/schema_engine/schema.cc (+41/-8)
plugin/schema_engine/schema.h (+1/-0)
plugin/show_dictionary/show_columns.cc (+3/-1)
plugin/show_dictionary/show_create_schema.cc (+2/-1)
plugin/show_dictionary/show_create_table.cc (+3/-1)
plugin/show_dictionary/show_indexes.cc (+3/-1)
plugin/show_dictionary/show_tables.cc (+2/-1)
plugin/show_schema_proto/show_schema_proto.cc (+6/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2491. By Stewart Smith on 2012-01-05

force a identifier::Schema to be constructed with a identifier::Catalog. This is close to the final 'big' part for CATALOG support. We also have to modify all around the server that creates identifier::Schema so it does so properly. Since a single Session cannot span schemas, we get off a wee bit easy :) The big limitation in this patch is that INFORMATION_SCHEMA and DATA_DICTIONARY only appear in the LOCAL catalog (and this really needs to be fixed before CATALOGs other than LOCAL are supported).

2490. By Stewart Smith on 2012-01-05

use the table identifier and catalog in the identifier in constructing the path in build_table_filename instead of the global drizzled::catalog::local_identifier(). Another step towards full CATALOG support

2489. By Stewart Smith on 2012-01-04

merge table_identifier unittest fix

2488. By Stewart Smith on 2012-01-04

TableShare use a TableIdentifier instead of db,table strings.

2487. By Stewart Smith on 2012-01-04

merge print_transaction_message filename/path bug fix (also hit in testing CATALOG)

2486. By Stewart Smith on 2012-01-04

merge off-by-one error message fix (was hitting this)

2485. By Stewart Smith on 2011-12-28

Schema identifier has a Catalog identifier. Use it instead of catalog::local_identifier() in most places in Schema identifier code

2484. By Stewart Smith on 2011-12-28

update innodb-system-table-view.result to include CATALOG in path to table

2483. By Stewart Smith on 2011-12-28

modify tableprototester to include local/ in the path for the test tables

2482. By Stewart Smith on 2011-12-28

modify transaction_log plugin to default to local/transaction.log to keep backwards compatibility with old drizzled (before chdir to local/ was removed)