Viewing all changes in revision 1086.
- Committer: Brian Aker
- Date: 2009-07-03 00:39:59 UTC
- mfrom: (1081.3.3 my_dir_removal)
- Revision ID: brian@gaz-20090703003959-7y7mwb8u7etz9jco
Merge David
- files added:
- client/drizzle.1
- drizzled/atomic
- drizzled/plugin
- drizzled/utf8
- gnulib
- plugin/auth_http
- plugin/gearman_udf
- plugin/info_schema
- plugin/logging_gearman
- plugin/logging_syslog
- plugin/multi_thread
- plugin/pool_of_threads
- plugin/signal_handler
- plugin/single_thread
- support-files/smf
- tests/suite/big
- tests/suite/big/r
- tests/suite/big/t
- tests/suite/md5
- tests/suite/md5/r
- tests/suite/md5/t
- files removed:
- client/Makefile.am
- drizzled/replication
- plugin/replicator
- plugin/uncompress
- plugin/uncompressed_length
- storage
- storage/innobase/handler
- tests/suite/binlog
- tests/suite/binlog/r
- tests/suite/binlog/std_data
- tests/suite/binlog/t
- tests/suite/bugs
- tests/suite/bugs/data
- tests/suite/bugs/r
- tests/suite/bugs/t
- tests/suite/manual
- tests/suite/manual/r
- tests/suite/manual/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
- 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/lex.h => drizzled/symbol_hash.gperf
- drizzled/unireg.cc => drizzled/table_proto_write.cc
- 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/md5/md5udf.cc => plugin/md5/md5.cc
- plugin/md5/plug.in => plugin/md5/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
- libdrizzle/ => plugin/oldlibdrizzle/
- libdrizzle/client.c => plugin/oldlibdrizzle/client.cc
- libdrizzle/drizzle.c => plugin/oldlibdrizzle/drizzle.cc
- libdrizzle/drizzle_data.c => plugin/oldlibdrizzle/drizzle_data.cc
- libdrizzle/errmsg.c => plugin/oldlibdrizzle/errmsg.cc
- libdrizzle/libdrizzle.c => plugin/oldlibdrizzle/libdrizzle.cc
- libdrizzle/libdrizzle_priv.c => plugin/oldlibdrizzle/libdrizzle_priv.cc
- libdrizzle/net_serv.c => plugin/oldlibdrizzle/net_serv.cc
- drizzled/protocol.cc => plugin/oldlibdrizzle/oldlibdrizzle.cc
- drizzled/protocol.h => plugin/oldlibdrizzle/oldlibdrizzle.h
- libdrizzle/drizzle_options.h => plugin/oldlibdrizzle/options.h
- libdrizzle/pack.c => plugin/oldlibdrizzle/pack.cc
- libdrizzle/password.c => plugin/oldlibdrizzle/password.cc
- libdrizzle/vio.c => plugin/oldlibdrizzle/vio.cc
- libdrizzle/viosocket.c => plugin/oldlibdrizzle/viosocket.cc
- tests/suite/broken/r/alias.result => tests/r/alias.result
- tests/suite/broken/r/almost_full.result => tests/r/almost_full.result
- tests/suite/broken/r/analyze.result => tests/r/analyze.result
- tests/suite/broken/r/archive.result => tests/r/archive.result
- tests/suite/broken/r/archive_aio_posix.result => tests/r/archive_aio_posix.result
- tests/suite/broken/r/archive_basic.result => tests/r/archive_basic.result
- tests/suite/broken/r/auto_increment.result => tests/r/auto_increment.result
- tests/suite/broken/r/connect.result => tests/r/connect.result
- tests/suite/broken/r/create.result => tests/r/create.result
- tests/suite/broken/r/create_not_windows.result => tests/r/create_not_windows.result
- tests/suite/broken/r/csv.result => tests/r/csv.result
- tests/suite/broken/r/csv_not_null.result => tests/r/csv_not_null.result
- tests/suite/broken/r/ctype_utf8.result => tests/r/ctype_utf8.result
- tests/suite/broken/r/deadlock_innodb.result => tests/r/deadlock_innodb.result
- tests/suite/broken/r/default.result => tests/r/default.result
- tests/suite/broken/r/derived.result => tests/r/derived.result
- tests/suite/broken/r/dirty_close.result => tests/r/dirty_close.result
- tests/suite/broken/r/mysqladmin.result => tests/r/drizzleadmin.result
- tests/suite/broken/r/mysqlcheck.result => tests/r/drizzlecheck.result
- tests/suite/broken/r/mysqldump.result => tests/r/drizzledump.result
- tests/suite/broken/r/drop.result => tests/r/drop.result
- tests/suite/broken/r/func_timestamp.result => tests/r/func_timestamp.result
- tests/suite/broken/r/have_binlog_format_mixed.require => tests/r/have_binlog_format_mixed.require
- tests/suite/broken/r/have_binlog_format_row.require => tests/r/have_binlog_format_row.require
- tests/suite/broken/r/have_debug.require => tests/r/have_debug.require
- tests/suite/broken/r/have_symlink.require => tests/r/have_symlink.require
- tests/suite/broken/r/index_merge_innodb.result => tests/r/index_merge_innodb.result
- tests/suite/broken/r/index_merge_myisam.result => tests/r/index_merge_myisam.result
- tests/suite/broken/r/information_schema_inno.result => tests/r/information_schema_inno.result
- tests/suite/broken/r/key_cache.result => tests/r/key_cache.result
- tests/suite/broken/r/lock_multi.result => tests/r/lock_multi.result
- tests/suite/broken/r/myisam.result => tests/r/myisam.result
- tests/suite/broken/r/mysql.result => tests/r/mysql.result
- tests/suite/broken/r/mysql_bug2397.result => tests/r/mysql_bug2397.result
- tests/suite/broken/r/negation_elimination.result => tests/r/negation_elimination.result
- tests/suite/broken/r/not_as_root.require => tests/r/not_as_root.require
- tests/suite/broken/r/null_key.result => tests/r/null_key.result
- tests/suite/broken/r/odbc.result => tests/r/odbc.result
- tests/suite/broken/r/olap.result => tests/r/olap.result
- tests/suite/broken/r/select_found.result => tests/r/select_found.result
- tests/suite/broken/r/select_safe.result => tests/r/select_safe.result
- tests/suite/broken/r/show_check.result => tests/r/show_check.result
- tests/suite/broken/r/error_simulation.result => tests/r/small_tmp_table.result
- tests/suite/broken/r/snowman.result => tests/r/snowman.result
- tests/suite/broken/r/status.result => tests/r/status.result
- tests/suite/broken/r/strict.result => tests/r/strict.result
- tests/suite/broken/r/subselect2.result => tests/r/subselect2.result
- tests/suite/broken/r/subselect_mat.result => tests/r/subselect_mat.result
- tests/suite/broken/r/subselect_no_mat.result => tests/r/subselect_no_mat.result
- tests/suite/broken/r/subselect_no_opts.result => tests/r/subselect_no_opts.result
- tests/suite/broken/r/subselect_no_semijoin.result => tests/r/subselect_no_semijoin.result
- tests/suite/broken/r/subselect_notembedded.result => tests/r/subselect_notembedded.result
- tests/suite/broken/r/subselect_sj.result => tests/r/subselect_sj.result
- tests/suite/broken/r/subselect_sj2.result => tests/r/subselect_sj2.result
- tests/suite/broken/r/symlink.result => tests/r/symlink.result
- tests/suite/broken/r/testdb_only.require => tests/r/testdb_only.require
- tests/suite/broken/r/truncate.result => tests/r/truncate.result
- tests/suite/broken/r/type_decimal.result => tests/r/type_decimal.result
- tests/suite/broken/r/type_enum.result => tests/r/type_enum.result
- tests/suite/broken/r/type_binary.result => tests/r/type_varbinary.result
- tests/suite/broken/r/union.result => tests/r/union.result
- tests/suite/broken/r/user_var.result => tests/r/user_var.result
- tests/suite/broken/r/varbinary.result => tests/r/varbinary.result
- tests/suite/broken/r/variables.result => tests/r/variables.result
- tests/suite/broken/r/variables_c.result => tests/r/variables_c.result
- tests/suite/broken/r/warnings_engine_disabled.result => tests/r/warnings_engine_disabled.result
- tests/suite/broken/r/archive-big.result => tests/suite/big/r/archive-big.result
- tests/suite/broken/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/suite/broken/r/sum_distinct-big.result => tests/suite/big/r/sum_distinct-big.result
- tests/suite/broken/r/variables-big.result => tests/suite/big/r/variables-big.result
- tests/suite/broken/t/archive-big.test => tests/suite/big/t/archive-big.test
- tests/suite/mordred/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/suite/broken/t/sum_distinct-big.test => tests/suite/big/t/sum_distinct-big.test
- tests/suite/broken/t/variables-big.test => tests/suite/big/t/variables-big.test
- tests/suite/broken/t/alias.test => tests/t/alias.test
- tests/suite/broken/t/almost_full.test => tests/t/almost_full.test
- tests/suite/broken/t/analyze.test => tests/t/analyze.test
- tests/suite/broken/t/archive.test => tests/t/archive.test
- tests/suite/broken/t/archive_aio_posix.test => tests/t/archive_aio_posix.test
- tests/suite/broken/t/archive_basic.test => tests/t/archive_basic.test
- tests/suite/broken/t/auto_increment.test => tests/t/auto_increment.test
- tests/suite/broken/t/concurrent_innodb-master.opt => tests/t/concurrent_innodb-master.opt
- tests/suite/mordred/t/connect.test => tests/t/connect.test
- tests/suite/mordred/t/create.test => tests/t/create.test
- tests/suite/mordred/t/create_not_windows.test => tests/t/create_not_windows.test
- tests/suite/mordred/t/csv.test => tests/t/csv.test
- tests/suite/mordred/t/csv_alter_table.test => tests/t/csv_alter_table.test
- tests/suite/mordred/t/csv_not_null.test => tests/t/csv_not_null.test
- tests/suite/mordred/t/ctype_utf8.test => tests/t/ctype_utf8.test
- tests/suite/mordred/t/deadlock_innodb.test => tests/t/deadlock_innodb.test
- tests/suite/mordred/t/default.test => tests/t/default.test
- tests/suite/mordred/t/derived.test => tests/t/derived.test
- tests/suite/mordred/t/dirty_close.test => tests/t/dirty_close.test
- tests/suite/broken/t/mysqlcheck.test => tests/t/drizzlecheck.test
- tests/suite/broken/t/mysqldump.test => tests/t/drizzledump.test
- tests/suite/mordred/t/drop.test => tests/t/drop.test
- tests/suite/broken/t/func_timestamp.test => tests/t/func_timestamp.test
- tests/suite/broken/t/index_merge_innodb.test => tests/t/index_merge_innodb.test
- tests/suite/broken/t/index_merge_myisam.test => tests/t/index_merge_myisam.test
- tests/suite/broken/t/information_schema_inno.test => tests/t/information_schema_inno.test
- tests/suite/broken/t/innodb.test => tests/t/innodb.test
- tests/suite/broken/t/key_cache.test => tests/t/key_cache.test
- tests/suite/broken/t/lock_multi.test => tests/t/lock_multi.test
- tests/suite/broken/t/myisam.test => tests/t/myisam.test
- tests/suite/broken/t/mysql.test => tests/t/mysql.test
- tests/suite/broken/t/mysql_bug2397.test => tests/t/mysql_bug2397.test
- tests/suite/broken/t/mysql_delimiter.sql => tests/t/mysql_delimiter.sql
- tests/suite/broken/t/mysql_delimiter_19799.sql => tests/t/mysql_delimiter_19799.sql
- tests/suite/broken/t/mysql_delimiter_source.sql => tests/t/mysql_delimiter_source.sql
- tests/suite/broken/t/negation_elimination.test => tests/t/negation_elimination.test
- tests/suite/broken/t/null_key.test => tests/t/null_key.test
- tests/suite/broken/t/odbc.test => tests/t/odbc.test
- tests/suite/broken/t/olap.test => tests/t/olap.test
- tests/suite/broken/t/select_found.test => tests/t/select_found.test
- tests/suite/broken/t/select_safe.test => tests/t/select_safe.test
- tests/suite/broken/t/show_check.test => tests/t/show_check.test
- tests/suite/mordred/t/error_simulation.test => tests/t/small_tmp_table.test
- tests/suite/broken/t/snowman.test => tests/t/snowman.test
- tests/suite/broken/t/status.test => tests/t/status.test
- tests/suite/broken/t/strict.test => tests/t/strict.test
- tests/suite/broken/t/subselect2.test => tests/t/subselect2.test
- tests/suite/broken/t/subselect_mat.test => tests/t/subselect_mat.test
- tests/suite/broken/t/subselect_no_mat.test => tests/t/subselect_no_mat.test
- tests/suite/broken/t/subselect_no_opts.test => tests/t/subselect_no_opts.test
- tests/suite/broken/t/subselect_no_semijoin.test => tests/t/subselect_no_semijoin.test
- tests/suite/broken/t/subselect_notembedded.test => tests/t/subselect_notembedded.test
- tests/suite/broken/t/subselect_sj.test => tests/t/subselect_sj.test
- tests/suite/broken/t/subselect_sj2.test => tests/t/subselect_sj2.test
- tests/suite/broken/t/symlink.test => tests/t/symlink.test
- tests/suite/broken/t/truncate.test => tests/t/truncate.test
- tests/suite/broken/t/type_decimal.test => tests/t/type_decimal.test
- tests/suite/broken/t/type_enum.test => tests/t/type_enum.test
- tests/suite/broken/t/type_binary.test => tests/t/type_varbinary.test
- tests/suite/broken/t/union.test => tests/t/union.test
- tests/suite/broken/t/user_var.test => tests/t/user_var.test
- tests/suite/broken/t/varbinary.test => tests/t/varbinary.test
- tests/suite/broken/t/variables.test => tests/t/variables.test
- tests/suite/broken/t/variables_c.test => tests/t/variables_c.test
- tests/suite/broken/t/warnings_engine_disabled.test => tests/t/warnings_engine_disabled.test
- files modified:
- .bzrignore
expand all
collapse all
added
removed
