Viewing all changes in revision 1267.
- Committer: Brian Aker
- Date: 2010-01-12 21:04:27 UTC
- mfrom: (1259.6.3 hash_algorithm)
- Revision ID: brian@gaz-20100112210427-ynafptc9b1jnv4d3
Merge Joe
- files added:
- client/include.am
- drizzled/algorithm
- drizzled/memory
- plugin/archive/tests
- plugin/archive/tests/r
- plugin/archive/tests/t
- plugin/blackhole/tests
- plugin/blackhole/tests/r
- plugin/blackhole/tests/t
- plugin/console
- plugin/crc32/tests
- plugin/crc32/tests/r
- plugin/crc32/tests/t
- plugin/csv/tests
- plugin/csv/tests/r
- plugin/csv/tests/t
- plugin/filtered_replicator
- plugin/information_engine
- plugin/memcached_functions
- plugin/memcached_functions/tests
- plugin/memcached_functions/tests/r
- plugin/memcached_functions/tests/t
- plugin/memcached_stats
- plugin/memcached_stats/tests
- plugin/memcached_stats/tests/r
- plugin/memcached_stats/tests/t
- plugin/mysql_protocol
- plugin/pool_of_threads/tests
- plugin/pool_of_threads/tests/r
- plugin/pool_of_threads/tests/t
- plugin/show_schema_proto
- plugin/show_schema_proto/tests
- plugin/show_schema_proto/tests/r
- plugin/show_schema_proto/tests/t
- plugin/single_thread/tests
- plugin/single_thread/tests/r
- plugin/single_thread/tests/t
- plugin/sleep
- plugin/sleep/tests
- plugin/sleep/tests/r
- plugin/sleep/tests/t
- files removed:
- drizzled/authentication.h
- tests/extra
- tests/extra/binlog_tests
- tests/extra/rpl_tests
- tests/misc
- tests/std_data/parts
- files renamed:
- config/register_plugins.py => config/pandora-plugin
- mysys/cached_directory.cc => drizzled/cached_directory.cc
- mysys/cached_directory.h => drizzled/cached_directory.h
- mysys/charset-def.cc => drizzled/charset-def.cc
- mysys/charset.cc => drizzled/charset.cc
- mystrings/m_ctype.h => drizzled/charset_info.h
- drizzled/handler.cc => drizzled/cursor.cc
- drizzled/handler.h => drizzled/cursor.h
- mystrings/decimal.cc => drizzled/decimal.cc
- mystrings/decimal.h => drizzled/decimal.h
- mysys/dynamic_array.cc => drizzled/dynamic_array.cc
- mysys/dynamic_array.h => drizzled/dynamic_array.h
- drizzled/Makefile.am => drizzled/include.am
- mysys/ => drizzled/internal/
- mystrings/CHARSET_INFO.txt => drizzled/internal/CHARSET_INFO.txt
- mystrings/bmove_upp.cc => drizzled/internal/bmove_upp.cc
- mystrings/ctype-bin.cc => drizzled/internal/ctype-bin.cc
- mystrings/ctype-mb.cc => drizzled/internal/ctype-mb.cc
- mystrings/ctype-simple.cc => drizzled/internal/ctype-simple.cc
- mystrings/ctype-uca.cc => drizzled/internal/ctype-uca.cc
- mystrings/ctype-utf8.cc => drizzled/internal/ctype-utf8.cc
- mystrings/ctype.cc => drizzled/internal/ctype.cc
- mystrings/dtoa.cc => drizzled/internal/dtoa.cc
- mystrings/int2str.cc => drizzled/internal/int2str.cc
- mystrings/llstr.cc => drizzled/internal/llstr.cc
- mystrings/longlong2str.cc => drizzled/internal/longlong2str.cc
- mystrings/m_string.h => drizzled/internal/m_string.h
- mystrings/my_strtoll10.cc => drizzled/internal/my_strtoll10.cc
- mystrings/my_uctype.h => drizzled/internal/my_uctype.h
- mystrings/t_ctype.h => drizzled/internal/t_ctype.h
- mystrings/utf8.h => drizzled/internal/utf8.h
- mysys/mulalloc.cc => drizzled/memory/multi_malloc.cc
- mysys/my_alloc.cc => drizzled/memory/root.cc
- mysys/my_alloc.h => drizzled/memory/root.h
- drizzled/thr_malloc.cc => drizzled/memory/sql_alloc.cc
- drizzled/sql_alloc.h => drizzled/memory/sql_alloc.h
- drizzled/message/Makefile.am => drizzled/message/include.am
- mysys/my_error.cc => drizzled/my_error.cc
- mysys/my_getopt.cc => drizzled/my_getopt.cc
- mysys/my_getopt.h => drizzled/my_getopt.h
- mysys/hash.cc => drizzled/my_hash.cc
- mysys/hash.h => drizzled/my_hash.h
- mysys/my_time.cc => drizzled/my_time.cc
- mysys/my_time.h => drizzled/my_time.h
- mysys/tree.cc => drizzled/my_tree.cc
- mysys/my_tree.h => drizzled/my_tree.h
- drizzled/opt_range.cc => drizzled/optimizer/range.cc
- drizzled/opt_range.h => drizzled/optimizer/range.h
- drizzled/opt_sum.cc => drizzled/optimizer/sum.cc
- drizzled/authentication.cc => drizzled/plugin/authentication.cc
- drizzled/plugin/protocol.h => drizzled/plugin/client.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/plugin/config.h.in => drizzled/plugin/load_list.h.in
- 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/plugin/handle.h => drizzled/plugin/module.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/plugin/applier.h => drizzled/plugin/transaction_applier.h
- drizzled/plugin/replicator.h => drizzled/plugin/transaction_replicator.h
- drizzled/slot/ => drizzled/service/
- mysys/my_bitmap.cc => drizzled/sql_bitmap.cc
- mysys/my_bitmap.h => drizzled/sql_bitmap.h
- mysys/thr_lock.cc => drizzled/thr_lock.cc
- mysys/thr_lock.h => drizzled/thr_lock.h
- drizzled/time.cc => drizzled/time_functions.cc
- mysys/typelib.cc => drizzled/typelib.cc
- mysys/typelib.h => drizzled/typelib.h
- m4/cxx_cinttypes.m4 => m4/pandora_cinttypes.m4
- m4/cxx_cstdint.m4 => m4/pandora_cstdint.m4
- m4/vl_lib_readline.m4 => m4/pandora_have_libreadline.m4
- m4/stl_hash.m4 => m4/pandora_stl_hash.m4
- m4/visibility.m4 => m4/pandora_visibility.m4
- tests/r/archive.result => plugin/archive/tests/r/archive.result
- tests/r/archive_aio_posix.result => plugin/archive/tests/r/archive_aio_posix.result
- tests/r/archive_basic.result => plugin/archive/tests/r/archive_basic.result
- tests/r/archive_discover.result => plugin/archive/tests/r/archive_discover.result
- tests/t/archive.test => plugin/archive/tests/t/archive.test
- tests/t/archive_aio_posix.test => plugin/archive/tests/t/archive_aio_posix.test
- tests/t/archive_basic.test => plugin/archive/tests/t/archive_basic.test
- tests/t/archive_discover.test => plugin/archive/tests/t/archive_discover.test
- tests/r/blackhole.result => plugin/blackhole/tests/r/blackhole.result
- tests/t/blackhole.test => plugin/blackhole/tests/t/blackhole.test
- tests/r/crc32.result => plugin/crc32/tests/r/crc32.result
- tests/t/crc32-master.opt => plugin/crc32/tests/t/crc32-master.opt
- tests/t/crc32.test => plugin/crc32/tests/t/crc32.test
- tests/r/csv.result => plugin/csv/tests/r/csv.result
- tests/r/csv_alter_table.result => plugin/csv/tests/r/csv_alter_table.result
- tests/r/csv_not_null.result => plugin/csv/tests/r/csv_not_null.result
- tests/t/csv.test => plugin/csv/tests/t/csv.test
- tests/t/csv_alter_table.test => plugin/csv/tests/t/csv_alter_table.test
- tests/t/csv_not_null.test => plugin/csv/tests/t/csv_not_null.test
- plugin/oldlibdrizzle/ => plugin/drizzle_protocol/
- plugin/heap/heapdef.h => plugin/heap/heap_priv.h
- plugin/info_schema/info_schema_methods.cc => plugin/info_schema/helper_methods.cc
- plugin/info_schema/info_schema_methods.h => plugin/info_schema/helper_methods.h
- plugin/innobase/plugin.am => plugin/innobase/Makefile.am
- plugin/innobase/plugin.ac => plugin/innobase/plug.in
- tests/suite/md5/ => plugin/md5/tests/
- plugin/myisam/myisamdef.h => plugin/myisam/myisam_priv.h
- tests/r/pool_of_threads.result => plugin/pool_of_threads/tests/r/pool_of_threads.result
- tests/t/pool_of_threads.test => plugin/pool_of_threads/tests/t/pool_of_threads.test
- plugin/command_log/ => plugin/transaction_log/
- tests/suite/command_log/ => plugin/transaction_log/tests/
- tests/suite/command_log/r/all.result => plugin/transaction_log/tests/r/filtered_replicator.result
- tests/suite/command_log/t/all-master.opt => plugin/transaction_log/tests/t/filtered_replicator-master.opt
- tests/suite/command_log/t/all.test => plugin/transaction_log/tests/t/filtered_replicator.test
- tests/suite/command_log/t/multi_insert.inc => plugin/transaction_log/tests/t/insert_multi.inc
- plugin/command_log/command_log.cc => plugin/transaction_log/transaction_log.cc
- plugin/command_log/command_log.h => plugin/transaction_log/transaction_log.h
- support-files/Makefile.am => support-files/include.am
- tests/Makefile.am => tests/include.am
- tests/r/frm.result => tests/r/broken_table_proto_file.result
- tests/t/frm.test => tests/t/broken_table_proto_file.test
- files modified:
- .bzrignore
expand all
collapse all
added
removed
