modified:
  drizzled/catalog/instance.h
  drizzled/cursor.cc
  drizzled/identifier/catalog.h
  drizzled/identifier/constants/schema.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/schema.h
  drizzled/identifier/table.cc
  drizzled/identifier/table.h
  drizzled/locking/global.cc
  drizzled/message/schema.cc
  drizzled/message/schema.h
  drizzled/plugin/storage_engine.cc
  drizzled/plugin/table_function.h
  drizzled/schema.cc
  drizzled/session.cc
  drizzled/show.cc
  drizzled/sql_base.cc
  drizzled/sql_load.cc
  drizzled/sql_parse.cc
  drizzled/sql_table.cc
  drizzled/sql_table.h
  drizzled/statement/alter_schema.cc
  drizzled/statement/alter_table.cc
  drizzled/statement/change_schema.cc
  drizzled/statement/create_index.cc
  drizzled/statement/create_schema.cc
  drizzled/statement/create_table.cc
  drizzled/statement/drop_index.cc
  drizzled/statement/drop_schema.cc
  drizzled/statement/rename_table.cc
  drizzled/table/concurrent.cc
  drizzled/table/instance/base.cc
  drizzled/table/instance/base.h
  drizzled/table/singular.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/memory/ha_heap.cc
  plugin/schema_engine/schema.cc
  plugin/schema_engine/schema.h
  plugin/show_dictionary/show_columns.cc
  plugin/show_dictionary/show_create_schema.cc
  plugin/show_dictionary/show_create_table.cc
  plugin/show_dictionary/show_indexes.cc
  plugin/show_dictionary/show_tables.cc
  plugin/show_schema_proto/show_schema_proto.cc
  plugin/table_cache_dictionary/tests/r/table_cache.result
  plugin/table_cache_dictionary/tests/r/table_definition_cache.result
  tests/r/show_check.result
  unittests/table_identifier.cc
pending merge tips: (use -v to see all merge revisions)
  Stewart Smith 2012-07-12 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