Viewing all changes in revision 1654.
- Committer: Brian Aker
- Date: 2010-07-09 20:51:34 UTC
- mfrom: (1643.4.3 drizzle)
- Revision ID: brian@gaz-20100709205134-ru4s0889youfrmm5
Merge of Patrick
- files added:
- .quickly
- drizzled/generator
- 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/blitzdb
- plugin/blitzdb/tests
- plugin/blitzdb/tests/r
- plugin/blitzdb/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/pbms
- plugin/pbms/src
- plugin/pbms/src/cslib
- plugin/pbxt
- plugin/pbxt/bin
- plugin/pbxt/src
- 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/syslog
- tests/r/pbxt
- unittests
- unittests/plugin
- files removed:
- drizzled/function/math/rand.cc
- plugin/innobase/mysql-test
- plugin/innobase/mysql-test/patches
- plugin/innobase/win-plugin
- plugin/logging_syslog
- files renamed:
- drizzled/plugin/context.h => drizzled/module/context.h
- drizzled/plugin/library.cc => drizzled/module/library.cc
- drizzled/plugin/library.h => drizzled/module/library.h
- drizzled/plugin/load_list.h.in => drizzled/module/load_list.h.in
- drizzled/plugin/loader.cc => drizzled/module/loader.cc
- drizzled/plugin/manifest.h => drizzled/module/manifest.h
- drizzled/plugin/module.h => drizzled/module/module.h
- drizzled/plugin/registry.cc => drizzled/module/registry.cc
- drizzled/plugin/registry.h => drizzled/module/registry.h
- drizzled/internal/utf8.h => drizzled/utf8/utf8.h
- plugin/logging_stats/score_board_slot.h => plugin/logging_stats/scoreboard_slot.h
- plugin/test_authz/ => plugin/simple_user_policy/
- plugin/test_authz/test_authz.cc => plugin/simple_user_policy/module.cc
- plugin/test_authz/tests/t/basic.disabled => plugin/simple_user_policy/tests/t/basic.test
- 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
- tests/r/mysql.result => tests/r/drizzle_client.result
- tests/r/mysqldump-max.result => tests/r/drizzledump-max.result
- tests/t/mysql.test => tests/t/drizzle_client.test
- tests/t/mysqldump-max.test => tests/t/drizzledump-max.test
- files modified:
- .bzrignore
expand all
collapse all
added
removed
