Viewing all changes in revision 1005.
- Committer: Brian Aker
- Date: 2009-05-05 00:40:45 UTC
- mfrom: (1003.2.7 mordred)
- Revision ID: brian@gaz-20090505004045-yns4biv63thufj1b
Merge Monty
- files added:
- client/get_password.cc
- drizzled/plugin
- plugin/auth_http
- plugin/logging_gearman
- tests/suite/big
- tests/suite/big/r
- tests/suite/big/t
- files removed:
- client/Makefile.am
- plugin/replicator
- plugin/uncompress
- plugin/uncompressed_length
- storage
- storage/innobase/handler
- tests/suite/vcol
- tests/suite/vcol/inc
- tests/suite/vcol/r
- tests/suite/vcol/t
- files renamed:
- drizzled/serialize/ => drizzled/message/
- drizzled/serialize/serialize.h => drizzled/message/all.h
- drizzled/serialize/replication_event.proto => drizzled/message/transaction.proto
- drizzled/serialize/replication_event_reader.cc => drizzled/message/transaction_reader.cc
- drizzled/serialize/replication_event_writer.cc => drizzled/message/transaction_writer.cc
- drizzled/plugin_authentication.h => drizzled/plugin/authentication.h
- drizzled/plugin_errmsg.h => drizzled/plugin/error_message_handler.h
- drizzled/plugin_logging.h => drizzled/plugin/logging_handler.h
- drizzled/plugin_qcache.h => drizzled/plugin/qcache.h
- drizzled/plugin_replicator.h => drizzled/plugin/replicator.h
- drizzled/plugin_scheduling.h => drizzled/plugin/scheduler.h
- drizzled/handlerton.cc => drizzled/plugin/storage_engine.cc
- drizzled/handlerton.h => drizzled/plugin/storage_engine.h
- drizzled/plugin_registry_impl.cc => drizzled/plugin_registry.cc
- drizzled/plugin_registry_impl.h => drizzled/plugin_registry.h
- drizzled/replicator.cc => drizzled/transaction_services.cc
- drizzled/replicator.h => drizzled/transaction_services.h
- storage/archive/ => plugin/archive/
- storage/archive/archive_performance.c => plugin/archive/archive_performance.cc
- storage/archive/archive_reader.c => plugin/archive/archive_reader.cc
- storage/archive/archive_test.c => plugin/archive/archive_test.cc
- storage/archive/concurrency_test.c => plugin/archive/concurrency_test.cc
- storage/archive/Makefile.am => plugin/archive/plugin.am
- storage/archive/plug.in => plugin/archive/plugin.ini
- plugin/auth_pam/plug.in => plugin/auth_pam/plugin.ini
- storage/blackhole/ => plugin/blackhole/
- storage/blackhole/plug.in => plugin/blackhole/plugin.ini
- plugin/compress/ => plugin/compression/
- plugin/compress/compressudf.cc => plugin/compression/compress.cc
- plugin/compress/plug.in => plugin/compression/plugin.ini
- plugin/uncompress/uncompressudf.cc => plugin/compression/uncompress.cc
- plugin/uncompressed_length/uncompressed_length.cc => plugin/compression/uncompressed_length.cc
- plugin/crc32/plug.in => plugin/crc32/plugin.ini
- storage/csv/ => plugin/csv/
- storage/csv/plug.in => plugin/csv/plugin.ini
- plugin/errmsg_stderr/plug.in => plugin/errmsg_stderr/plugin.ini
- storage/heap/ => plugin/heap/
- storage/heap/hp_block.c => plugin/heap/hp_block.cc
- storage/heap/hp_clear.c => plugin/heap/hp_clear.cc
- storage/heap/hp_close.c => plugin/heap/hp_close.cc
- storage/heap/hp_create.c => plugin/heap/hp_create.cc
- storage/heap/hp_delete.c => plugin/heap/hp_delete.cc
- storage/heap/hp_dspace.c => plugin/heap/hp_dspace.cc
- storage/heap/hp_extra.c => plugin/heap/hp_extra.cc
- storage/heap/hp_hash.c => plugin/heap/hp_hash.cc
- storage/heap/hp_info.c => plugin/heap/hp_info.cc
- storage/heap/hp_open.c => plugin/heap/hp_open.cc
- storage/heap/hp_panic.c => plugin/heap/hp_panic.cc
- storage/heap/hp_record.c => plugin/heap/hp_record.cc
- storage/heap/hp_rectest.c => plugin/heap/hp_rectest.cc
- storage/heap/hp_rename.c => plugin/heap/hp_rename.cc
- storage/heap/hp_rfirst.c => plugin/heap/hp_rfirst.cc
- storage/heap/hp_rkey.c => plugin/heap/hp_rkey.cc
- storage/heap/hp_rlast.c => plugin/heap/hp_rlast.cc
- storage/heap/hp_rnext.c => plugin/heap/hp_rnext.cc
- storage/heap/hp_rprev.c => plugin/heap/hp_rprev.cc
- storage/heap/hp_rrnd.c => plugin/heap/hp_rrnd.cc
- storage/heap/hp_rsame.c => plugin/heap/hp_rsame.cc
- storage/heap/hp_scan.c => plugin/heap/hp_scan.cc
- storage/heap/hp_static.c => plugin/heap/hp_static.cc
- storage/heap/hp_update.c => plugin/heap/hp_update.cc
- storage/heap/hp_write.c => plugin/heap/hp_write.cc
- storage/heap/Makefile.am => plugin/heap/plugin.am
- storage/heap/plug.in => plugin/heap/plugin.ini
- plugin/hello_world/plug.in => plugin/hello_world/plugin.ini
- storage/innobase/ => plugin/innobase/
- storage/innobase/drizzle/ => plugin/innobase/handler/
- storage/innobase/plug.in => plugin/innobase/plugin.ac
- storage/innobase/Makefile.am => plugin/innobase/plugin.am
- plugin/logging_query/plug.in => plugin/logging_query/plugin.ini
- plugin/logging_syslog/plug.in => plugin/logging_syslog/plugin.ini
- plugin/md5/md5udf.cc => plugin/md5/md5.cc
- plugin/md5/plug.in => plugin/md5/plugin.ini
- plugin/multi_thread/plug.in => plugin/multi_thread/plugin.ini
- storage/myisam/ => plugin/myisam/
- storage/myisam/mf_keycache.c => plugin/myisam/mf_keycache.cc
- storage/myisam/mf_keycaches.c => plugin/myisam/mf_keycaches.cc
- storage/myisam/mi_cache.c => plugin/myisam/mi_cache.cc
- storage/myisam/mi_changed.c => plugin/myisam/mi_changed.cc
- storage/myisam/mi_check.c => plugin/myisam/mi_check.cc
- storage/myisam/mi_checksum.c => plugin/myisam/mi_checksum.cc
- storage/myisam/mi_close.c => plugin/myisam/mi_close.cc
- storage/myisam/mi_create.c => plugin/myisam/mi_create.cc
- storage/myisam/mi_delete.c => plugin/myisam/mi_delete.cc
- storage/myisam/mi_delete_all.c => plugin/myisam/mi_delete_all.cc
- storage/myisam/mi_delete_table.c => plugin/myisam/mi_delete_table.cc
- storage/myisam/mi_dynrec.c => plugin/myisam/mi_dynrec.cc
- storage/myisam/mi_extra.c => plugin/myisam/mi_extra.cc
- storage/myisam/mi_info.c => plugin/myisam/mi_info.cc
- storage/myisam/mi_key.c => plugin/myisam/mi_key.cc
- storage/myisam/mi_keycache.c => plugin/myisam/mi_keycache.cc
- storage/myisam/mi_locking.c => plugin/myisam/mi_locking.cc
- storage/myisam/mi_open.c => plugin/myisam/mi_open.cc
- storage/myisam/mi_page.c => plugin/myisam/mi_page.cc
- storage/myisam/mi_panic.c => plugin/myisam/mi_panic.cc
- storage/myisam/mi_preload.c => plugin/myisam/mi_preload.cc
- storage/myisam/mi_range.c => plugin/myisam/mi_range.cc
- storage/myisam/mi_rename.c => plugin/myisam/mi_rename.cc
- storage/myisam/mi_reportnone.c => plugin/myisam/mi_reportnone.cc
- storage/myisam/mi_rfirst.c => plugin/myisam/mi_rfirst.cc
- storage/myisam/mi_rkey.c => plugin/myisam/mi_rkey.cc
- storage/myisam/mi_rlast.c => plugin/myisam/mi_rlast.cc
- storage/myisam/mi_rnext.c => plugin/myisam/mi_rnext.cc
- storage/myisam/mi_rnext_same.c => plugin/myisam/mi_rnext_same.cc
- storage/myisam/mi_rprev.c => plugin/myisam/mi_rprev.cc
- storage/myisam/mi_rrnd.c => plugin/myisam/mi_rrnd.cc
- storage/myisam/mi_rsame.c => plugin/myisam/mi_rsame.cc
- storage/myisam/mi_rsamepos.c => plugin/myisam/mi_rsamepos.cc
- storage/myisam/mi_scan.c => plugin/myisam/mi_scan.cc
- storage/myisam/mi_search.c => plugin/myisam/mi_search.cc
- storage/myisam/mi_static.c => plugin/myisam/mi_static.cc
- storage/myisam/mi_statrec.c => plugin/myisam/mi_statrec.cc
- storage/myisam/mi_unique.c => plugin/myisam/mi_unique.cc
- storage/myisam/mi_update.c => plugin/myisam/mi_update.cc
- storage/myisam/mi_write.c => plugin/myisam/mi_write.cc
- storage/myisam/my_handler.c => plugin/myisam/my_handler.cc
- storage/myisam/my_handler_errors.c => plugin/myisam/my_handler_errors.cc
- storage/myisam/my_pread.c => plugin/myisam/my_pread.cc
- storage/myisam/Makefile.am => plugin/myisam/plugin.am
- storage/myisam/plug.in => plugin/myisam/plugin.ini
- storage/myisam/sort.c => plugin/myisam/sort.cc
- libdrizzleclient/ => plugin/oldlibdrizzle/
- libdrizzleclient/client.c => plugin/oldlibdrizzle/client.cc
- libdrizzleclient/drizzle.c => plugin/oldlibdrizzle/drizzle.cc
- libdrizzleclient/drizzle_data.c => plugin/oldlibdrizzle/drizzle_data.cc
- libdrizzleclient/errmsg.c => plugin/oldlibdrizzle/errmsg.cc
- libdrizzleclient/libdrizzle.c => plugin/oldlibdrizzle/libdrizzle.cc
- libdrizzleclient/libdrizzle_priv.c => plugin/oldlibdrizzle/libdrizzle_priv.cc
- libdrizzleclient/net_serv.c => plugin/oldlibdrizzle/net_serv.cc
- drizzled/protocol.cc => plugin/oldlibdrizzle/oldlibdrizzle.cc
- drizzled/protocol.h => plugin/oldlibdrizzle/oldlibdrizzle.h
- libdrizzleclient/pack.c => plugin/oldlibdrizzle/pack.cc
- libdrizzleclient/password.c => plugin/oldlibdrizzle/password.cc
- libdrizzleclient/vio.c => plugin/oldlibdrizzle/vio.cc
- libdrizzleclient/viosocket.c => plugin/oldlibdrizzle/viosocket.cc
- plugin/pool_of_threads/plug.in => plugin/pool_of_threads/plugin.ini
- plugin/signal_handler/plug.in => plugin/signal_handler/plugin.ini
- plugin/single_thread/plug.in => plugin/single_thread/plugin.ini
- tests/r/archive-big.result => tests/suite/big/r/archive-big.result
- tests/r/concurrent_innodb.result => tests/suite/big/r/concurrent_innodb.result
- tests/r/read_many_rows_innodb.result => tests/suite/big/r/read_many_rows_innodb.result
- tests/r/sum_distinct-big.result => tests/suite/big/r/sum_distinct-big.result
- tests/r/variables-big.result => tests/suite/big/r/variables-big.result
- tests/t/archive-big.test => tests/suite/big/t/archive-big.test
- tests/t/concurrent_innodb.test => tests/suite/big/t/concurrent_innodb.test
- tests/t/read_many_rows_innodb.test => tests/suite/big/t/read_many_rows_innodb.test
- tests/t/sum_distinct-big.test => tests/suite/big/t/sum_distinct-big.test
- tests/t/variables-big.test => tests/suite/big/t/variables-big.test
- tests/r/init_connect.result => tests/suite/broken/r/init_connect.result
- tests/r/rename_concurrent.result => tests/suite/broken/r/rename_concurrent.result
- tests/t/init_connect.test => tests/suite/broken/t/init_connect.test
- tests/t/rename_concurrent.test => tests/suite/broken/t/rename_concurrent.test
- files modified:
- .bzrignore
expand all
collapse all
added
removed
