Viewing all changes in revision 1271.7.21.
- Committer: Monty Taylor
- Date: 2010-03-11 18:27:20 UTC
- mfrom: (1283.2.50 staging)
- mto: (1283.2.65 staging)
- mto: This revision was merged to the branch mainline in revision 1380.
- Revision ID: mordred@inaugust.com-20100311182720-hd1h87y6cb1b1mp0
Merged trunk.
- files added:
- drizzled/item_result.h
- plugin/collation_dictionary
- plugin/collation_dictionary/tests
- plugin/collation_dictionary/tests/r
- plugin/collation_dictionary/tests/t
- plugin/database_function
- plugin/function_engine
- plugin/hex_functions
- plugin/innobase/tests
- plugin/innobase/tests/r
- plugin/innobase/tests/t
- plugin/registry_dictionary
- plugin/registry_dictionary/tests
- plugin/registry_dictionary/tests/r
- plugin/registry_dictionary/tests/t
- plugin/reverse_function
- plugin/schema_dictionary
- plugin/schema_dictionary/tests
- plugin/schema_dictionary/tests/r
- plugin/schema_dictionary/tests/t
- plugin/schema_engine
- plugin/schema_engine/tests
- plugin/schema_engine/tests/r
- plugin/schema_engine/tests/t
- plugin/session_dictionary
- plugin/session_dictionary/tests
- plugin/session_dictionary/tests/r
- plugin/session_dictionary/tests/t
- plugin/status_dictionary
- plugin/status_dictionary/tests
- plugin/status_dictionary/tests/r
- plugin/status_dictionary/tests/t
- plugin/substr_functions
- plugin/test_authz
- plugin/test_authz/tests
- plugin/test_authz/tests/r
- plugin/test_authz/tests/t
- plugin/uuid_function
- files removed:
- drizzled/function/str/database.cc
- plugin/info_schema
- plugin/information_engine
- files renamed:
- drizzled/ha_trx_info.cc => drizzled/resource_context.cc
- drizzled/ha_trx_info.h => drizzled/resource_context.h
- plugin/drizzle_protocol/oldlibdrizzle.cc => plugin/drizzle_protocol/drizzle_protocol.cc
- plugin/drizzle_protocol/oldlibdrizzle.h => plugin/drizzle_protocol/drizzle_protocol.h
- files modified:
- .bzrignore
- drizzled/visibility.h *
expand all
collapse all
added
removed
