Merge lp://staging/~stewart/drizzle/tableshare-use-tableidentifier into lp://staging/~drizzle-trunk/drizzle/development
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~stewart/drizzle/tableshare-use-tableidentifier |
| Merge into: | lp://staging/~drizzle-trunk/drizzle/development |
| Diff against target: |
1271 lines (+305/-150) 37 files modified
drizzled/catalog/local.cc (+9/-1) drizzled/catalog/local.h (+4/-1) drizzled/data_home.cc (+2/-12) drizzled/data_home.h (+0/-2) drizzled/drizzled.cc (+1/-1) drizzled/errmsg_print.cc (+1/-1) drizzled/function/str/load_file.cc (+3/-2) drizzled/identifier/catalog.cc (+1/-1) drizzled/identifier/catalog.h (+7/-1) drizzled/identifier/schema.cc (+6/-3) drizzled/identifier/schema.h (+3/-0) drizzled/identifier/table.cc (+7/-3) drizzled/identifier/table.h (+2/-2) drizzled/main.cc (+0/-5) drizzled/session.cc (+2/-2) drizzled/sql_load.cc (+3/-2) drizzled/table/instance/base.cc (+20/-28) drizzled/table/instance/base.h (+5/-6) plugin/innobase/dict/dict0dict.cc (+13/-2) plugin/innobase/handler/ha_innodb.cc (+28/-1) plugin/innobase/tests/r/innodb-system-table-view.result (+9/-9) plugin/schema_engine/schema.cc (+10/-3) plugin/table_cache_dictionary/tests/r/table_cache.result (+2/-2) plugin/table_cache_dictionary/tests/r/table_definition_cache.result (+2/-2) plugin/tableprototester/tableprototester.cc (+8/-8) plugin/transaction_log/hexdump_transaction_message.cc (+1/-1) plugin/transaction_log/module.cc (+1/-1) plugin/transaction_log/print_transaction_message.cc (+1/-1) plugin/transaction_log/tests/r/bug660779.result (+6/-6) plugin/transaction_log/tests/r/bug911643.result (+71/-0) plugin/transaction_log/tests/r/variables.result (+1/-1) plugin/transaction_log/tests/t/bug660779.test (+3/-3) plugin/transaction_log/tests/t/bug911643-master.opt (+1/-0) plugin/transaction_log/tests/t/bug911643.test (+28/-0) tests/r/broken_table_proto_file.result (+1/-1) tests/r/show_check.result (+28/-28) unittests/table_identifier.cc (+15/-8) |
| To merge this branch: | bzr merge lp://staging/~stewart/drizzle/tableshare-use-tableidentifier |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brian Aker | Pending | ||
| Drizzle Merge Team | Pending | ||
|
Review via email:
|
|||
Description of the change
This switches TableShare over to use an identifier instead of two strings (db and table_name).
This makes one change to some appearances of a couple of data_dictionary tables. Odds are these were always incorrect (IIRC all I_S table names should be all UPPER_CASE anyway - because SQL loves to shout).
http://
Unmerged revisions
- 2489. By Stewart Smith
-
merge table_identifier unittest fix
- 2488. By Stewart Smith
-
TableShare use a TableIdentifier instead of db,table strings.
- 2487. By Stewart Smith
-
merge print_transacti
on_message filename/path bug fix (also hit in testing CATALOG) - 2486. By Stewart Smith
-
merge off-by-one error message fix (was hitting this)
- 2485. By Stewart Smith
-
Schema identifier has a Catalog identifier. Use it instead of catalog:
:local_ identifier( ) in most places in Schema identifier code - 2484. By Stewart Smith
-
update innodb-
system- table-view. result to include CATALOG in path to table - 2483. By Stewart Smith
-
modify tableprototester to include local/ in the path for the test tables
- 2482. By Stewart Smith
-
modify transaction_log plugin to default to local/transacti
on.log to keep backwards compatibility with old drizzled (before chdir to local/ was removed) - 2481. By Stewart Smith
-
no longer chdir into local CATALOG. Instead, generate paths everywhere (well... in identifiers) that include the path to the correct CATALOG. Currently that's just LOCAL, but we get closer. Also added is some backwards compatibility code in InnoDB for old data dictionary entries that didn't include CATALOG in catalog/db/table but just had db/table. The next step is to construct the table and schema identifiers with the current CATALOG.
