Viewing all changes in revision 1315.
- Committer: Brian Aker
- Date: 2010-03-01 05:38:54 UTC
- mfrom: (1309.1.19 build)
- Revision ID: brian@gaz-20100301053854-sojk4m6jc1yagk7s
MErge Strewart.
- files added:
- drizzled/algorithm/crc32.cc
- plugin/innobase/mysql-test
- plugin/innobase/mysql-test/patches
- plugin/innobase/win-plugin
- files removed:
- .quickly
- drizzled/module
- drizzled/optimizer/access_method
- plugin/auth_file
- plugin/auth_file/tests
- plugin/auth_file/tests/r
- plugin/auth_file/tests/t
- plugin/auth_ldap
- plugin/auth_ldap/schema
- plugin/auth_ldap/schema/openldap
- plugin/auth_test
- plugin/auth_test/tests
- plugin/auth_test/tests/r
- plugin/auth_test/tests/t
- plugin/embedded_innodb
- plugin/embedded_innodb/test-suite-dir
- plugin/embedded_innodb/test-suite-dir/embedded_innodb
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_buffer_pool_size_default.result
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit0.result
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit1.result
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit2.result
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_lru_block_access_recency.result
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_write_io_threads_default.result
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_truncate_table-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_pkey_duplicate-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on-master.opt
- plugin/hello_events
- 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/rand_function
- plugin/rand_function/tests
- plugin/rand_function/tests/r
- plugin/rand_function/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/simple_user_policy
- plugin/simple_user_policy/tests
- plugin/simple_user_policy/tests/r
- plugin/simple_user_policy/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
- unittests
- files renamed:
- drizzled/utf8/utf8.h => drizzled/internal/utf8.h
- drizzled/module/library.cc => drizzled/plugin/library.cc
- drizzled/module/library.h => drizzled/plugin/library.h
- drizzled/module/load_list.h.in => drizzled/plugin/load_list.h.in
- drizzled/module/loader.cc => drizzled/plugin/loader.cc
- drizzled/module/manifest.h => drizzled/plugin/manifest.h
- drizzled/module/module.h => drizzled/plugin/module.h
- drizzled/module/registry.cc => drizzled/plugin/registry.cc
- drizzled/module/registry.h => drizzled/plugin/registry.h
- m4/pandora_have_libinnodb.m4 => m4/pandora_have_innodb.m4
- plugin/drizzle_protocol/drizzle_protocol.cc => plugin/drizzle_protocol/oldlibdrizzle.cc
- plugin/drizzle_protocol/drizzle_protocol.h => plugin/drizzle_protocol/oldlibdrizzle.h
- plugin/memcached_functions/tests/t/memc.disabled => plugin/memcached_functions/tests/t/memc.test
- plugin/memcached_stats/tests/t/describe.disabled => plugin/memcached_stats/tests/t/describe.test
- plugin/memcached_stats/tests/t/query.disabled => plugin/memcached_stats/tests/t/query.test
- plugin/mysql_protocol/mysql_protocol.cc => plugin/mysql_protocol/oldlibdrizzle.cc
- plugin/mysql_protocol/mysql_protocol.h => plugin/mysql_protocol/oldlibdrizzle.h
- plugin/transaction_log/tests/r/variables.result => plugin/transaction_log/tests/r/sync_method_every_write.result
- plugin/transaction_log/tests/t/variables-master.opt => plugin/transaction_log/tests/t/sync_method_every_write-master.opt
- plugin/transaction_log/tests/t/variables.test => plugin/transaction_log/tests/t/sync_method_every_write.test
- plugin/blackhole/tests/r/create_max_fields.result => tests/r/create_max_fields.result
- tests/r/drizzle_client.result => tests/r/mysql.result
- tests/suite/jp/t/jp_alter_utf8.test => tests/suite/jp/t/jp_alter_utf8.disabled
- tests/suite/jp/t/jp_create_tbl_utf8.test => tests/suite/jp/t/jp_create_tbl_utf8.disabled
- tests/suite/jp/t/jp_enum_utf8.test => tests/suite/jp/t/jp_enum_utf8.disabled
- plugin/blackhole/tests/t/create_max_fields.test => tests/t/create_max_fields.test
- tests/t/drizzle_client.test => tests/t/mysql.test
- files modified:
- .bzrignore
- drizzled/visibility.h *
expand all
collapse all
added
removed
