lp:~stewart/drizzle/new-catalog-work
- Get this branch:
- bzr branch lp:~stewart/drizzle/new-catalog-work
Branch merges
- Drizzle Trunk: Pending requested
-
Diff: 1836 lines (+368/-208)48 files modifieddrizzled/catalog/instance.h (+14/-3)
drizzled/cursor.cc (+1/-1)
drizzled/identifier/catalog.h (+1/-1)
drizzled/identifier/constants/schema.cc (+3/-1)
drizzled/identifier/schema.cc (+7/-5)
drizzled/identifier/schema.h (+9/-1)
drizzled/identifier/table.cc (+14/-11)
drizzled/identifier/table.h (+6/-4)
drizzled/locking/global.cc (+4/-1)
drizzled/message/schema.cc (+9/-18)
drizzled/message/schema.h (+1/-2)
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 (+6/-3)
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 (+4/-2)
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 (+24/-26)
drizzled/table/instance/base.h (+10/-6)
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)
plugin/table_cache_dictionary/tests/r/table_cache.result (+2/-2)
plugin/table_cache_dictionary/tests/r/table_definition_cache.result (+2/-2)
tests/r/show_check.result (+28/-28)
unittests/table_identifier.cc (+7/-7)
Branch information
Recent revisions
- 2577. By Stewart Smith
-
fix initialization of message::schema to be from the Schema identifier, which includes the CATALOG name, so that we can create schemas in catalogs other than LOCAL
- 2576. By Stewart Smith
-
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). - 2575. By Stewart Smith
-
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 - 2569. By Drizzle Continuous Integration
-
added:
plugin/json_server/ db_access. cc
plugin/json_server/ db_access. h
plugin/json_server/ http_handler. cc
plugin/json_server/ http_handler. h
plugin/json_server/ sql_executor. cc
plugin/json_server/ sql_executor. h
plugin/json_server/ sql_generator. cc
plugin/json_server/ sql_generator. h
plugin/json_server/ sql_to_ json_generator. cc
plugin/json_server/ sql_to_ json_generator. h
modified:
plugin/json_server/ docs/index. rst
plugin/json_server/ json_server. cc
plugin/json_server/ plugin. ini
plugin/json_server/ tests/r/ basic.result
plugin/json_server/ tests/t/ basic.test
pending merge tips: (use -v to see all merge revisions)
srivastavamohit91... 2012-06-28 test cases added - 2568. By Drizzle Continuous Integration
-
modified:
tests/lib/server_ mgmt/drizzled. py
tests/lib/server_ mgmt/server_ management. py
tests/lib/test_ mgmt/test_ execution. py
tests/lib/util/ crashme_ methods. py
tests/lib/util/ sqlbench_ methods. py
tests/lib/util/ sysbench_ methods. py
tests/qp_tests/ sysbench/ sysbench_ readonly_ test.py
pending merge tips: (use -v to see all merge revisions)
patrick crews 2012-06-19 Further refinements to sysbench test. Cleanup the reset / prepare phase + output reporting
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:drizzle