Viewing all changes in revision 1114.1.5.
- Committer: Monty Taylor
- Date: 2009-10-13 06:36:19 UTC
- mfrom: (1178 staging)
- mto: (1182.1.1 staging)
- mto: This revision was merged to the branch mainline in revision 1183.
- Revision ID: mordred@inaugust.com-20091013063619-zplf8vwn216i9qlb
Merged up with trunk.
- files added:
- drizzled/alter_info.cc
- drizzled/optimizer
- drizzled/service
- plugin/console
- plugin/filtered_replicator
- plugin/memcached_stats
- plugin/sleep
- tests/suite/memcached_stats
- tests/suite/memcached_stats/r
- tests/suite/memcached_stats/t
- tests/suite/sleep
- tests/suite/sleep/r
- tests/suite/sleep/t
- files removed:
- drizzled/authentication.h
- files renamed:
- drizzled/authentication.cc => drizzled/plugin/authentication.cc
- drizzled/plugin/protocol.h => drizzled/plugin/client.h
- drizzled/plugin/applier.h => drizzled/plugin/command_applier.h
- drizzled/plugin/replicator.h => drizzled/plugin/command_replicator.h
- drizzled/errmsg.cc => drizzled/plugin/error_message.cc
- drizzled/plugin/error_message_handler.h => drizzled/plugin/error_message.h
- drizzled/sql_udf.cc => drizzled/plugin/function.cc
- drizzled/function/create.h => drizzled/plugin/function.h
- drizzled/info_schema.h => drizzled/plugin/info_schema_table.h
- drizzled/listen.cc => drizzled/plugin/listen.cc
- drizzled/sql_plugin.cc => drizzled/plugin/loader.cc
- drizzled/logging.cc => drizzled/plugin/logging.cc
- drizzled/plugin/logging_handler.h => drizzled/plugin/logging.h
- drizzled/qcache.cc => drizzled/plugin/query_cache.cc
- drizzled/plugin/qcache.h => drizzled/plugin/query_cache.h
- drizzled/plugin_registry.cc => drizzled/plugin/registry.cc
- drizzled/plugin_registry.h => drizzled/plugin/registry.h
- drizzled/scheduling.cc => drizzled/plugin/scheduler.cc
- drizzled/thr_malloc.cc => drizzled/sql_alloc.cc
- drizzled/command.h => drizzled/statement.h
- drizzled/command/ => drizzled/statement/
- m4/extensions.m4 => m4/pandora_extensions.m4
- mysys/tree.cc => mysys/my_tree.cc
- tests/suite/command_log/r/all.result => tests/suite/command_log/r/filtered_replicator.result
- tests/suite/command_log/t/all-master.opt => tests/suite/command_log/t/filtered_replicator-master.opt
- tests/suite/command_log/t/all.test => tests/suite/command_log/t/filtered_replicator.test
- tests/suite/command_log/t/multi_insert.inc => tests/suite/command_log/t/insert_multi.inc
- files modified:
- .bzrignore
expand all
collapse all
added
removed
