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/drizzlecheck.1
- mystrings
- tests/extra
- tests/extra/binlog_tests
- tests/extra/rpl_tests
- tests/misc
- tests/std_data/parts
- files removed:
- client/errname.cc
- drizzled/algorithm
- drizzled/memory
- drizzled/optimizer
- drizzled/service
- drizzled/statement
- plugin/archive/tests
- plugin/archive/tests/r
- plugin/archive/tests/t
- plugin/ascii
- plugin/benchmark
- plugin/blackhole/tests
- plugin/blackhole/tests/r
- plugin/blackhole/tests/t
- plugin/charlength
- plugin/connection_id
- 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/data_engine
- plugin/default_replicator
- plugin/errmsg_notify
- plugin/errmsg_notify/tests
- plugin/errmsg_notify/tests/r
- plugin/errmsg_notify/tests/t
- plugin/errmsg_stderr/tests
- plugin/errmsg_stderr/tests/r
- plugin/errmsg_stderr/tests/t
- plugin/filtered_replicator
- plugin/hello_world/tests
- plugin/hello_world/tests/r
- plugin/hello_world/tests/t
- plugin/information_engine
- plugin/length
- 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/rot13
- plugin/rot13/tests
- plugin/rot13/tests/r
- plugin/rot13/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
- plugin/transaction_log
- plugin/transaction_log/tests
- plugin/transaction_log/tests/r
- plugin/transaction_log/tests/t
- plugin/version
- files renamed:
- client/linebuffer.h => client/my_readline.h
- client/linebuffer.cc => client/readline.cc
- config/pandora-plugin => config/register_plugins.py
- drizzled/include.am => drizzled/Makefile.am
- drizzled/plugin/authentication.cc => drizzled/authentication.cc
- drizzled/plugin/error_message.cc => drizzled/errmsg.cc
- drizzled/plugin/function.h => drizzled/function/create.h
- drizzled/user_var_entry.cc => drizzled/function/user_var_entry.cc
- drizzled/cursor.cc => drizzled/handler.cc
- drizzled/cursor.h => drizzled/handler.h
- drizzled/plugin/info_schema_table.h => drizzled/info_schema.h
- drizzled/join_table.h => drizzled/join_tab.h
- drizzled/plugin/listen.cc => drizzled/listen.cc
- drizzled/plugin/logging.cc => drizzled/logging.cc
- drizzled/message/include.am => drizzled/message/Makefile.am
- drizzled/optimizer/range.cc => drizzled/opt_range.cc
- drizzled/optimizer/range.h => drizzled/opt_range.h
- drizzled/optimizer/sum.cc => drizzled/opt_sum.cc
- drizzled/plugin/transaction_applier.h => drizzled/plugin/applier.h
- drizzled/plugin/error_message.h => drizzled/plugin/error_message_handler.h
- drizzled/plugin/logging.h => drizzled/plugin/logging_handler.h
- drizzled/plugin/client.h => drizzled/plugin/protocol.h
- drizzled/plugin/query_cache.h => drizzled/plugin/qcache.h
- drizzled/plugin/transaction_replicator.h => drizzled/plugin/replicator.h
- drizzled/plugin/registry.cc => drizzled/plugin_registry.cc
- drizzled/plugin/registry.h => drizzled/plugin_registry.h
- drizzled/plugin/query_cache.cc => drizzled/qcache.cc
- drizzled/plugin/scheduler.cc => drizzled/scheduling.cc
- drizzled/memory/sql_alloc.h => drizzled/sql_alloc.h
- drizzled/plugin/loader.cc => drizzled/sql_plugin.cc
- drizzled/plugin/function.cc => drizzled/sql_udf.cc
- drizzled/memory/sql_alloc.cc => drizzled/thr_malloc.cc
- drizzled/time_functions.cc => drizzled/time.cc
- drizzled/replication_services.cc => drizzled/transaction_services.cc
- drizzled/replication_services.h => drizzled/transaction_services.h
- m4/pandora_64bit.m4 => m4/64bit.m4
- m4/pandora_ensure_gcc_version.m4 => m4/check_gcc_version.m4
- m4/pandora_cinttypes.m4 => m4/cxx_cinttypes.m4
- m4/pandora_cstdint.m4 => m4/cxx_cstdint.m4
- m4/pandora_check_cxx_standard.m4 => m4/cxx_standard.m4
- m4/pandora_extensions.m4 => m4/extensions.m4
- m4/pandora_shared_ptr.m4 => m4/shared_ptr.m4
- m4/pandora_stl_hash.m4 => m4/stl_hash.m4
- m4/pandora_have_libreadline.m4 => m4/vl_lib_readline.m4
- drizzled/internal/CHARSET_INFO.txt => mystrings/CHARSET_INFO.txt
- drizzled/internal/bmove_upp.cc => mystrings/bmove_upp.cc
- drizzled/ctype-bin.cc => mystrings/ctype-bin.cc
- drizzled/ctype-mb.cc => mystrings/ctype-mb.cc
- drizzled/ctype-simple.cc => mystrings/ctype-simple.cc
- drizzled/ctype-uca.cc => mystrings/ctype-uca.cc
- drizzled/ctype-utf8.cc => mystrings/ctype-utf8.cc
- drizzled/ctype.cc => mystrings/ctype.cc
- drizzled/decimal.cc => mystrings/decimal.cc
- drizzled/decimal.h => mystrings/decimal.h
- drizzled/internal/dtoa.cc => mystrings/dtoa.cc
- drizzled/internal/int2str.cc => mystrings/int2str.cc
- drizzled/internal/llstr.cc => mystrings/llstr.cc
- drizzled/internal/longlong2str.cc => mystrings/longlong2str.cc
- drizzled/charset_info.h => mystrings/m_ctype.h
- drizzled/internal/m_string.h => mystrings/m_string.h
- drizzled/internal/my_strtoll10.cc => mystrings/my_strtoll10.cc
- drizzled/ctype-uni.cc => mystrings/my_uctype.h
- drizzled/internal/t_ctype.h => mystrings/t_ctype.h
- drizzled/internal/utf8.h => mystrings/utf8.h
- drizzled/internal/ => mysys/
- drizzled/dynamic_array.cc => mysys/array.cc
- drizzled/charset-def.cc => mysys/charset-def.cc
- drizzled/charset.cc => mysys/charset.cc
- drizzled/my_hash.cc => mysys/hash.cc
- drizzled/my_hash.h => mysys/hash.h
- drizzled/memory/multi_malloc.cc => mysys/mulalloc.cc
- drizzled/memory/root.cc => mysys/my_alloc.cc
- drizzled/memory/root.h => mysys/my_alloc.h
- drizzled/sql_bitmap.cc => mysys/my_bitmap.cc
- drizzled/sql_bitmap.h => mysys/my_bitmap.h
- drizzled/my_error.cc => mysys/my_error.cc
- drizzled/my_getopt.cc => mysys/my_getopt.cc
- drizzled/my_getopt.h => mysys/my_getopt.h
- drizzled/my_getsystime.cc => mysys/my_getsystime.cc
- drizzled/my_time.cc => mysys/my_time.cc
- drizzled/my_time.h => mysys/my_time.h
- drizzled/my_tree.h => mysys/my_tree.h
- drizzled/thr_lock.cc => mysys/thr_lock.cc
- drizzled/thr_lock.h => mysys/thr_lock.h
- drizzled/my_tree.cc => mysys/tree.cc
- drizzled/typelib.cc => mysys/typelib.cc
- drizzled/typelib.h => mysys/typelib.h
- plugin/heap/heap_priv.h => plugin/heap/heapdef.h
- plugin/info_schema/helper_methods.cc => plugin/info_schema/info_schema_methods.cc
- plugin/info_schema/helper_methods.h => plugin/info_schema/info_schema_methods.h
- plugin/innobase/plug.in => plugin/innobase/plugin.ac
- plugin/innobase/Makefile.am => plugin/innobase/plugin.am
- plugin/myisam/myisam_priv.h => plugin/myisam/myisamdef.h
- plugin/drizzle_protocol/ => plugin/oldlibdrizzle/
- support-files/include.am => support-files/Makefile.am
- tests/include.am => tests/Makefile.am
- plugin/archive/tests/r/archive.result => tests/r/archive.result
- plugin/archive/tests/r/archive_aio_posix.result => tests/r/archive_aio_posix.result
- plugin/archive/tests/r/archive_basic.result => tests/r/archive_basic.result
- plugin/crc32/tests/r/crc32.result => tests/r/crc32.result
- plugin/csv/tests/r/csv.result => tests/r/csv.result
- plugin/csv/tests/r/csv_alter_table.result => tests/r/csv_alter_table.result
- plugin/csv/tests/r/csv_not_null.result => tests/r/csv_not_null.result
- tests/r/broken_table_proto_file.result => tests/r/frm.result
- plugin/hello_world/tests/r/hello_world.result => tests/r/hello_world.result
- plugin/pool_of_threads/tests/r/pool_of_threads.result => tests/r/pool_of_threads.result
- tests/r/myisam_rollback.result => tests/r/rollback.result
- tests/std_data/jisx0201_utf8.dat => tests/suite/jp/std_data/jisx0201_utf8.dat
- tests/std_data/jisx0208_utf8.dat => tests/suite/jp/std_data/jisx0208_utf8.dat
- tests/std_data/jisx0212_utf8.dat => tests/suite/jp/std_data/jisx0212_utf8.dat
- plugin/md5/tests/ => tests/suite/md5/
- plugin/archive/tests/t/archive.test => tests/t/archive.test
- plugin/archive/tests/t/archive_aio_posix.test => tests/t/archive_aio_posix.test
- plugin/archive/tests/t/archive_basic.test => tests/t/archive_basic.test
- plugin/crc32/tests/t/crc32-master.opt => tests/t/crc32-master.opt
- plugin/crc32/tests/t/crc32.test => tests/t/crc32.test
- plugin/csv/tests/t/csv.test => tests/t/csv.test
- plugin/csv/tests/t/csv_alter_table.test => tests/t/csv_alter_table.test
- plugin/csv/tests/t/csv_not_null.test => tests/t/csv_not_null.test
- tests/t/broken_table_proto_file.test => tests/t/frm.test
- plugin/hello_world/tests/t/hello_world.test => tests/t/hello_world.test
- plugin/pool_of_threads/tests/t/pool_of_threads.test => tests/t/pool_of_threads.test
- tests/t/myisam_rollback.test => tests/t/rollback.test
- files modified:
- .bzrignore
expand all
collapse all
added
removed
