Viewing all changes in revision 1291.
- Committer: Padraig O'Sullivan
- Date: 2010-04-17 01:38:47 UTC
- mfrom: (1237.9.238 bad-staging)
- Revision ID: osullivan.padraig@gmail.com-20100417013847-ibjioqsfbmf5yg4g
Merge trunk.
- files added:
- drizzled/algorithm/sha1.cc
- plugin/auth_file
- plugin/auth_file/tests
- plugin/auth_file/tests/r
- plugin/auth_file/tests/t
- plugin/auth_test
- plugin/auth_test/tests
- plugin/auth_test/tests/r
- plugin/auth_test/tests/t
- plugin/embedded_innodb
- plugin/embedded_innodb/tests
- plugin/embedded_innodb/tests/r
- plugin/embedded_innodb/tests/t
- plugin/information_schema_dictionary
- plugin/information_schema_dictionary/tests
- plugin/information_schema_dictionary/tests/r
- plugin/information_schema_dictionary/tests/t
- plugin/logging_stats
- plugin/logging_stats/tests
- plugin/logging_stats/tests/r
- plugin/logging_stats/tests/t
- plugin/mysql_protocol/prototest
- plugin/mysql_protocol/prototest/prototest
- plugin/mysql_protocol/prototest/prototest/mysql
- plugin/mysql_protocol/tests
- plugin/mysql_protocol/tests/r
- plugin/mysql_protocol/tests/t
- plugin/pbxt
- plugin/pbxt/bin
- plugin/pbxt/src
- plugin/rabbitmq
- plugin/rabbitmq/tests
- plugin/rabbitmq/tests/r
- plugin/rabbitmq/tests/t
- plugin/replication_dictionary
- plugin/replication_dictionary/tests
- plugin/replication_dictionary/tests/r
- plugin/replication_dictionary/tests/t
- plugin/show_dictionary
- plugin/show_dictionary/tests
- plugin/show_dictionary/tests/r
- plugin/show_dictionary/tests/t
- plugin/table_cache_dictionary
- plugin/table_cache_dictionary/tests
- plugin/table_cache_dictionary/tests/r
- plugin/table_cache_dictionary/tests/t
- plugin/user_function
- tests/r/pbxt
- files removed:
- drizzled/algorithm/crc32.cc
- files renamed:
- m4/pandora_have_innodb.m4 => m4/pandora_have_libinnodb.m4
- tests/r/create_max_fields.result => plugin/blackhole/tests/r/create_max_fields.result
- tests/t/create_max_fields.test => plugin/blackhole/tests/t/create_max_fields.test
- plugin/memcached_functions/tests/t/memc.test => plugin/memcached_functions/tests/t/memc.disabled
- plugin/memcached_stats/tests/t/describe.test => plugin/memcached_stats/tests/t/describe.disabled
- plugin/memcached_stats/tests/t/query.test => plugin/memcached_stats/tests/t/query.disabled
- plugin/mysql_protocol/oldlibdrizzle.cc => plugin/mysql_protocol/mysql_protocol.cc
- plugin/mysql_protocol/oldlibdrizzle.h => plugin/mysql_protocol/mysql_protocol.h
- plugin/schema_dictionary/show_columns.cc => plugin/show_dictionary/show_columns.cc
- plugin/schema_dictionary/show_columns.h => plugin/show_dictionary/show_columns.h
- plugin/schema_dictionary/show_indexes.cc => plugin/show_dictionary/show_indexes.cc
- plugin/schema_dictionary/show_indexes.h => plugin/show_dictionary/show_indexes.h
- plugin/schema_dictionary/show_table_status.cc => plugin/show_dictionary/show_table_status.cc
- plugin/schema_dictionary/show_table_status.h => plugin/show_dictionary/show_table_status.h
- plugin/schema_dictionary/show_tables.h => plugin/show_dictionary/show_tables.h
- plugin/schema_dictionary/show_temporary_tables.cc => plugin/show_dictionary/show_temporary_tables.cc
- plugin/schema_dictionary/show_temporary_tables.h => plugin/show_dictionary/show_temporary_tables.h
- plugin/test_authz/tests/t/basic.test => plugin/test_authz/tests/t/basic.disabled
- plugin/transaction_log/tests/r/sync_method_every_write.result => plugin/transaction_log/tests/r/variables.result
- plugin/transaction_log/tests/t/sync_method_every_write-master.opt => plugin/transaction_log/tests/t/variables-master.opt
- plugin/transaction_log/tests/t/sync_method_every_write.test => plugin/transaction_log/tests/t/variables.test
- files modified:
- Makefile.am
expand all
collapse all
added
removed
