Viewing all changes in revision 1491.6.3.
- Committer: Monty Taylor
- Date: 2010-05-24 16:09:25 UTC
- mfrom: (1561 rollup)
- mto: (1377.8.4 unittests) (1283.61.7 embedded-innodb-bug586348-merge) (1578.1.1 new-staging)
- mto: This revision was merged to the branch mainline in revision 1579.
- Revision ID: mordred@inaugust.com-20100524160925-prcom10xmlgda6e2
Merged trunk.
- files added:
- .quickly
- drizzled/module
- drizzled/optimizer/access_method
- plugin/auth_ldap
- plugin/embedded_innodb/test-suite-dir
- plugin/embedded_innodb/test-suite-dir/embedded_innodb
- 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/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
- files removed:
- drizzled/message/master_list.proto
- plugin/innobase/mysql-test
- plugin/innobase/mysql-test/patches
- plugin/innobase/win-plugin
- files renamed:
- config/pandora_plugin_config.py => config/pandora-plugin.ini
- 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
- plugin/embedded_innodb/tests/ => plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/
- files modified:
- .bzrignore
expand all
collapse all
added
removed
