Viewing all changes in revision 1124.2.15.
- Committer: Diego Medina
- Date: 2009-10-05 04:05:29 UTC
- mfrom: (1161 staging)
- mto: This revision was merged to the branch mainline in revision 1178.
- Revision ID: diego.medina@sun.com-20091005040529-5g1qe9gxzslpgefd
resolved small merge issue
- files added:
- drizzled/alter_info.cc
- plugin/console
- plugin/filtered_replicator
- plugin/sleep
- 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/slot/function.cc => drizzled/plugin/function.cc
- drizzled/info_schema.h => drizzled/plugin/info_schema_table.h
- drizzled/slot/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/scheduling.cc => drizzled/plugin/scheduler.cc
- drizzled/slot/ => drizzled/service/
- drizzled/thr_malloc.cc => drizzled/sql_alloc.cc
- m4/extensions.m4 => m4/pandora_extensions.m4
- 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
