Viewing all changes in revision 754.1.3.
- Committer: Monty Taylor
- Date: 2008-12-30 17:54:25 UTC
- mto: This revision was merged to the branch mainline in revision 755.
- Revision ID: mordred@inaugust.com-20081230175425-ub4a4u8lilqdia0p
Msgmerge.
- files added:
- client/completion_hash.cc
- drizzled/replication
- storage/innobase/handler
- tests/suite/binlog
- tests/suite/binlog/r
- tests/suite/binlog/std_data
- tests/suite/binlog/t
- tests/suite/mordred
- tests/suite/mordred/t
- tests/suite/rpl
- tests/suite/rpl/data
- tests/suite/rpl/include
- tests/suite/rpl/r
- tests/suite/rpl/t
- files removed:
- config/link-warning.h
- drizzled/atomic
- drizzled/plugin
- drizzled/utf8
- gnulib
- plugin/logging_syslog
- plugin/multi_thread
- plugin/pool_of_threads
- plugin/signal_handler
- plugin/single_thread
- tests/suite/big
- tests/suite/big/r
- tests/suite/big/t
- files renamed:
- drizzled/plugin/storage_engine.cc => drizzled/handlerton.cc
- drizzled/plugin/storage_engine.h => drizzled/handlerton.h
- drizzled/symbol_hash.gperf => drizzled/lex.h
- drizzled/plugin/authentication.h => drizzled/plugin_authentication.h
- drizzled/plugin/configvar.h => drizzled/plugin_configvar.h
- drizzled/plugin/error_message_handler.h => drizzled/plugin_errmsg.h
- drizzled/plugin/logging_handler.h => drizzled/plugin_logging.h
- drizzled/plugin/parser.h => drizzled/plugin_parser.h
- drizzled/plugin/qcache.h => drizzled/plugin_qcache.h
- drizzled/plugin/replicator.h => drizzled/plugin_replicator.h
- drizzled/plugin/scheduler.h => drizzled/plugin_scheduling.h
- drizzled/table_proto_write.cc => drizzled/unireg.cc
- libdrizzleclient/ => libdrizzle/
- libdrizzleclient/options.h => libdrizzle/drizzle_options.h
- libdrizzleclient/libdrizzleclient.ver => libdrizzle/libdrizzle.ver
- storage/myisam/list.cc => mysys/list.cc
- storage/myisam/my_list.h => mysys/my_list.h
- plugin/protobuf_replicator/ => plugin/replicator/
- plugin/protobuf_replicator/protobuf_replicator.cc => plugin/replicator/replicator.cc
- storage/heap/hp_block.cc => storage/heap/hp_block.c
- storage/heap/hp_clear.cc => storage/heap/hp_clear.c
- storage/heap/hp_close.cc => storage/heap/hp_close.c
- storage/heap/hp_create.cc => storage/heap/hp_create.c
- storage/heap/hp_delete.cc => storage/heap/hp_delete.c
- storage/heap/hp_dspace.cc => storage/heap/hp_dspace.c
- storage/heap/hp_extra.cc => storage/heap/hp_extra.c
- storage/heap/hp_hash.cc => storage/heap/hp_hash.c
- storage/heap/hp_info.cc => storage/heap/hp_info.c
- storage/heap/hp_open.cc => storage/heap/hp_open.c
- storage/heap/hp_panic.cc => storage/heap/hp_panic.c
- storage/heap/hp_record.cc => storage/heap/hp_record.c
- storage/heap/hp_rectest.cc => storage/heap/hp_rectest.c
- storage/heap/hp_rename.cc => storage/heap/hp_rename.c
- storage/heap/hp_rfirst.cc => storage/heap/hp_rfirst.c
- storage/heap/hp_rkey.cc => storage/heap/hp_rkey.c
- storage/heap/hp_rlast.cc => storage/heap/hp_rlast.c
- storage/heap/hp_rnext.cc => storage/heap/hp_rnext.c
- storage/heap/hp_rprev.cc => storage/heap/hp_rprev.c
- storage/heap/hp_rrnd.cc => storage/heap/hp_rrnd.c
- storage/heap/hp_rsame.cc => storage/heap/hp_rsame.c
- storage/heap/hp_scan.cc => storage/heap/hp_scan.c
- storage/heap/hp_static.cc => storage/heap/hp_static.c
- storage/heap/hp_update.cc => storage/heap/hp_update.c
- storage/heap/hp_write.cc => storage/heap/hp_write.c
- storage/innobase/handler/ => storage/innobase/drizzle/
- storage/myisam/mf_keycache.cc => storage/myisam/mf_keycache.c
- storage/myisam/mf_keycaches.cc => storage/myisam/mf_keycaches.c
- storage/myisam/mi_cache.cc => storage/myisam/mi_cache.c
- storage/myisam/mi_changed.cc => storage/myisam/mi_changed.c
- storage/myisam/mi_check.cc => storage/myisam/mi_check.c
- storage/myisam/mi_checksum.cc => storage/myisam/mi_checksum.c
- storage/myisam/mi_close.cc => storage/myisam/mi_close.c
- storage/myisam/mi_create.cc => storage/myisam/mi_create.c
- storage/myisam/mi_delete.cc => storage/myisam/mi_delete.c
- storage/myisam/mi_delete_all.cc => storage/myisam/mi_delete_all.c
- storage/myisam/mi_delete_table.cc => storage/myisam/mi_delete_table.c
- storage/myisam/mi_dynrec.cc => storage/myisam/mi_dynrec.c
- storage/myisam/mi_extra.cc => storage/myisam/mi_extra.c
- storage/myisam/mi_info.cc => storage/myisam/mi_info.c
- storage/myisam/mi_key.cc => storage/myisam/mi_key.c
- storage/myisam/mi_keycache.cc => storage/myisam/mi_keycache.c
- storage/myisam/mi_locking.cc => storage/myisam/mi_locking.c
- storage/myisam/mi_open.cc => storage/myisam/mi_open.c
- storage/myisam/mi_page.cc => storage/myisam/mi_page.c
- storage/myisam/mi_panic.cc => storage/myisam/mi_panic.c
- storage/myisam/mi_preload.cc => storage/myisam/mi_preload.c
- storage/myisam/mi_range.cc => storage/myisam/mi_range.c
- storage/myisam/mi_rename.cc => storage/myisam/mi_rename.c
- storage/myisam/mi_reportnone.cc => storage/myisam/mi_reportnone.c
- storage/myisam/mi_rfirst.cc => storage/myisam/mi_rfirst.c
- storage/myisam/mi_rkey.cc => storage/myisam/mi_rkey.c
- storage/myisam/mi_rlast.cc => storage/myisam/mi_rlast.c
- storage/myisam/mi_rnext.cc => storage/myisam/mi_rnext.c
- storage/myisam/mi_rnext_same.cc => storage/myisam/mi_rnext_same.c
- storage/myisam/mi_rprev.cc => storage/myisam/mi_rprev.c
- storage/myisam/mi_rrnd.cc => storage/myisam/mi_rrnd.c
- storage/myisam/mi_rsame.cc => storage/myisam/mi_rsame.c
- storage/myisam/mi_rsamepos.cc => storage/myisam/mi_rsamepos.c
- storage/myisam/mi_scan.cc => storage/myisam/mi_scan.c
- storage/myisam/mi_search.cc => storage/myisam/mi_search.c
- storage/myisam/mi_static.cc => storage/myisam/mi_static.c
- storage/myisam/mi_statrec.cc => storage/myisam/mi_statrec.c
- storage/myisam/mi_unique.cc => storage/myisam/mi_unique.c
- storage/myisam/mi_update.cc => storage/myisam/mi_update.c
- storage/myisam/mi_write.cc => storage/myisam/mi_write.c
- storage/myisam/my_handler.cc => storage/myisam/my_handler.c
- storage/myisam/my_handler_errors.cc => storage/myisam/my_handler_errors.c
- storage/myisam/my_pread.cc => storage/myisam/my_pread.c
- storage/myisam/sort.cc => storage/myisam/sort.c
- support-files/libdrizzleclient.pc.in => support-files/libdrizzle.pc.in
- tests/suite/big/r/read_many_rows_innodb.result => tests/r/read_many_rows_innodb.result
- tests/suite/big/r/sum_distinct-big.result => tests/r/sum_distinct-big.result
- tests/suite/big/r/variables-big.result => tests/r/variables-big.result
- tests/r/alias.result => tests/suite/broken/r/alias.result
- tests/r/almost_full.result => tests/suite/broken/r/almost_full.result
- tests/r/analyze.result => tests/suite/broken/r/analyze.result
- tests/suite/big/r/archive-big.result => tests/suite/broken/r/archive-big.result
- tests/r/archive.result => tests/suite/broken/r/archive.result
- tests/r/archive_aio_posix.result => tests/suite/broken/r/archive_aio_posix.result
- tests/r/archive_basic.result => tests/suite/broken/r/archive_basic.result
- tests/r/auto_increment.result => tests/suite/broken/r/auto_increment.result
- tests/r/clef.result => tests/suite/broken/r/clef.result
- tests/suite/big/r/concurrent_innodb.result => tests/suite/broken/r/concurrent_innodb.result
- tests/r/ctype_utf8.result => tests/suite/broken/r/ctype_utf8.result
- tests/r/deadlock_innodb.result => tests/suite/broken/r/deadlock_innodb.result
- tests/r/dirty_close.result => tests/suite/broken/r/dirty_close.result
- tests/r/drop.result => tests/suite/broken/r/drop.result
- tests/r/frm.result => tests/suite/broken/r/frm.result
- tests/r/func_timestamp.result => tests/suite/broken/r/func_timestamp.result
- tests/r/index_merge_innodb.result => tests/suite/broken/r/index_merge_innodb.result
- tests/r/index_merge_myisam.result => tests/suite/broken/r/index_merge_myisam.result
- tests/r/information_schema_inno.result => tests/suite/broken/r/information_schema_inno.result
- tests/r/init_connect.result => tests/suite/broken/r/init_connect.result
- tests/r/key_cache.result => tests/suite/broken/r/key_cache.result
- tests/r/lock_multi.result => tests/suite/broken/r/lock_multi.result
- tests/r/myisam.result => tests/suite/broken/r/myisam.result
- tests/r/mysql_bug2397.result => tests/suite/broken/r/mysql_bug2397.result
- tests/r/strict.result => tests/suite/broken/r/strict.result
- tests/r/subselect2.result => tests/suite/broken/r/subselect2.result
- tests/r/subselect_notembedded.result => tests/suite/broken/r/subselect_notembedded.result
- tests/r/subselect_sj.result => tests/suite/broken/r/subselect_sj.result
- tests/r/subselect_sj2.result => tests/suite/broken/r/subselect_sj2.result
- tests/r/testdb_only.require => tests/suite/broken/r/testdb_only.require
- tests/r/warnings_engine_disabled.result => tests/suite/broken/r/warnings_engine_disabled.result
- tests/t/alias.test => tests/suite/broken/t/alias.test
- tests/t/almost_full.test => tests/suite/broken/t/almost_full.test
- tests/t/analyze.test => tests/suite/broken/t/analyze.test
- tests/suite/big/t/archive-big.test => tests/suite/broken/t/archive-big.test
- tests/t/archive.test => tests/suite/broken/t/archive.test
- tests/t/archive_aio_posix.test => tests/suite/broken/t/archive_aio_posix.test
- tests/t/archive_basic.test => tests/suite/broken/t/archive_basic.test
- tests/t/auto_increment.test => tests/suite/broken/t/auto_increment.test
- tests/t/clef.test => tests/suite/broken/t/clef.test
- tests/t/concurrent_innodb-master.opt => tests/suite/broken/t/concurrent_innodb-master.opt
- tests/suite/big/t/concurrent_innodb.test => tests/suite/broken/t/concurrent_innodb.test
- tests/t/frm.test => tests/suite/broken/t/frm.test
- tests/t/func_timestamp.test => tests/suite/broken/t/func_timestamp.test
- tests/t/index_merge_innodb.test => tests/suite/broken/t/index_merge_innodb.test
- tests/t/index_merge_myisam.test => tests/suite/broken/t/index_merge_myisam.test
- tests/t/information_schema_inno.test => tests/suite/broken/t/information_schema_inno.test
- tests/t/init_connect.test => tests/suite/broken/t/init_connect.test
- tests/t/innodb.test => tests/suite/broken/t/innodb.test
- tests/t/key_cache.test => tests/suite/broken/t/key_cache.test
- tests/t/lock_multi.test => tests/suite/broken/t/lock_multi.test
- tests/t/myisam.test => tests/suite/broken/t/myisam.test
- tests/t/mysql_bug2397.test => tests/suite/broken/t/mysql_bug2397.test
- tests/t/strict.test => tests/suite/broken/t/strict.test
- tests/t/subselect2.test => tests/suite/broken/t/subselect2.test
- tests/t/subselect_notembedded.test => tests/suite/broken/t/subselect_notembedded.test
- tests/t/subselect_sj.test => tests/suite/broken/t/subselect_sj.test
- tests/t/subselect_sj2.test => tests/suite/broken/t/subselect_sj2.test
- tests/t/warnings_engine_disabled.test => tests/suite/broken/t/warnings_engine_disabled.test
- tests/t/ctype_utf8.test => tests/suite/mordred/t/ctype_utf8.test
- tests/t/deadlock_innodb.test => tests/suite/mordred/t/deadlock_innodb.test
- tests/t/dirty_close.test => tests/suite/mordred/t/dirty_close.test
- tests/t/drop.test => tests/suite/mordred/t/drop.test
- tests/suite/big/t/read_many_rows_innodb.test => tests/t/read_many_rows_innodb.test
- tests/suite/big/t/sum_distinct-big.test => tests/t/sum_distinct-big.test
- tests/suite/big/t/variables-big.test => tests/t/variables-big.test
- files modified:
- .bzrignore
expand all
collapse all
added
removed
