Merge lp://staging/~stewart/drizzle/use-catalog-for-path into lp://staging/~drizzle-trunk/drizzle/development
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~stewart/drizzle/use-catalog-for-path |
| Merge into: | lp://staging/~drizzle-trunk/drizzle/development |
| Prerequisite: | lp://staging/~barry-leslie/drizzle/drizzle_pbmsV2 |
| Diff against target: |
1101 lines (+205/-96) 59 files modified
drizzled/catalog/local.cc (+5/-0) drizzled/catalog/local.h (+3/-0) drizzled/data_home.cc (+2/-7) drizzled/data_home.h (+0/-1) drizzled/drizzled.cc (+1/-4) drizzled/function/str/load_file.cc (+2/-1) drizzled/identifier/catalog.cc (+6/-2) drizzled/identifier/catalog.h (+5/-0) drizzled/identifier/schema.cc (+26/-13) drizzled/identifier/schema.h (+6/-0) drizzled/identifier/table.cc (+11/-1) drizzled/main.cc (+0/-7) drizzled/message/replication_options.h (+47/-0) drizzled/session.cc (+1/-1) drizzled/sql_load.cc (+2/-1) plugin/filtered_replicator/tests/t/var_filteredschemas.test (+1/-1) plugin/filtered_replicator/tests/t/var_filteredtables.test (+1/-1) plugin/filtered_replicator/tests/t/var_schemaregex.test (+1/-1) plugin/filtered_replicator/tests/t/var_tableregex.test (+1/-1) plugin/innobase/dict/dict0dict.cc (+13/-2) plugin/innobase/handler/ha_innodb.cc (+8/-1) plugin/innobase/tests/r/innodb-system-table-view.result (+9/-9) plugin/pbms/src/plugin/ha_pbms.cc (+2/-1) plugin/schema_engine/schema.cc (+10/-2) plugin/storage_engine_api_tester/tests/t/txn_log_insert.test (+1/-1) plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test (+1/-1) plugin/tableprototester/tableprototester.cc (+3/-3) plugin/transaction_log/tests/r/truncate_log.result (+2/-2) plugin/transaction_log/tests/t/alter.test (+1/-1) plugin/transaction_log/tests/t/alter_schema.test (+1/-1) plugin/transaction_log/tests/t/auto_commit.test (+1/-1) plugin/transaction_log/tests/t/blob.test (+1/-1) plugin/transaction_log/tests/t/create_select.test (+1/-1) plugin/transaction_log/tests/t/create_table.test (+1/-1) plugin/transaction_log/tests/t/delete.test (+1/-1) plugin/transaction_log/tests/t/embedded_quotes.test (+1/-1) plugin/transaction_log/tests/t/insert.test (+1/-1) plugin/transaction_log/tests/t/insert_multi.test (+1/-1) plugin/transaction_log/tests/t/insert_on_duplicate_update.test (+1/-1) plugin/transaction_log/tests/t/insert_select.test (+1/-1) plugin/transaction_log/tests/t/multi_column_primary_key.test (+1/-1) plugin/transaction_log/tests/t/multi_table.test (+1/-1) plugin/transaction_log/tests/t/no_modification.test (+1/-1) plugin/transaction_log/tests/t/no_primary_key.test (+1/-1) plugin/transaction_log/tests/t/null_values.test (+1/-1) plugin/transaction_log/tests/t/rand.test (+1/-1) plugin/transaction_log/tests/t/rename.test (+1/-1) plugin/transaction_log/tests/t/replace.test (+1/-1) plugin/transaction_log/tests/t/rollback.test (+1/-1) plugin/transaction_log/tests/t/rollback_statement.test (+2/-2) plugin/transaction_log/tests/t/schema.test (+1/-1) plugin/transaction_log/tests/t/select_for_update.test (+1/-1) plugin/transaction_log/tests/t/temp_tables.test (+1/-1) plugin/transaction_log/tests/t/truncate.test (+1/-1) plugin/transaction_log/tests/t/truncate_log.test (+2/-2) plugin/transaction_log/tests/t/update.test (+1/-1) tests/lib/sys_mgmt/codeTree.py (+3/-0) tests/r/broken_table_proto_file.result (+1/-1) unittests/table_identifier.cc (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~stewart/drizzle/use-catalog-for-path |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lee Bieber (community) | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
first patch in series of getting catalog support going. This changes the working directory of the server and constructs the patch including a catalog name.
This tree also has PBMSv2 branch and fixes up PBMSv2 to just (for the moment) hard code in local catalog. this will need to be fixed in the future for PBMS to support multiple catalogs.
| Stewart Smith (stewart) wrote | # |
| Stewart Smith (stewart) wrote | # |
| Lee Bieber (kalebral-deactivatedaccount) wrote | # |
Unmerged revisions
- 2273. By Stewart Smith
-
remove some debug printouts from the CATALOG work.
- 2272. By Stewart Smith
-
fix unit test for table_identifier to include catalog in the path
- 2271. By Stewart Smith
-
merge in PBMS v2 tree as well as fixing the pbs_get_
database_ home_path( ) method to just get the local catalog path. This will need to be fixed for PBMS to do full catalog support. - 2270. By Stewart Smith
-
start using Catalog to generat paths, server working directory of datadir, not inside local catalog.
PBMS is currently not working due to reconstructing paths itself.
We have the schema identifier generate the path, not places around the code
generating paths based on getDataHomeLocal().Also modify innobase plugin to deal with foreign keys and table names involving
catalog/schema/ table
http://