3447 John David Duncan 2011-09-07 [merge]
Merge with mainline mysql-5.5-cluster
removed:
mysql-test/suite/bugs/
mysql-test/suite/bugs/combinations
mysql-test/suite/bugs/data/
mysql-test/suite/bugs/data/rpl_bug12691.dat
mysql-test/suite/bugs/r/
mysql-test/suite/bugs/r/bug57108.result
mysql-test/suite/bugs/r/rpl_bug12691.result
mysql-test/suite/bugs/r/rpl_bug31582.result
mysql-test/suite/bugs/r/rpl_bug31583.result
mysql-test/suite/bugs/r/rpl_bug33029.result
mysql-test/suite/bugs/r/rpl_bug38205.result
mysql-test/suite/bugs/t/
mysql-test/suite/bugs/t/bug57108-master.opt
mysql-test/suite/bugs/t/bug57108.test
mysql-test/suite/bugs/t/rpl_bug12691.test
mysql-test/suite/bugs/t/rpl_bug31582.test
mysql-test/suite/bugs/t/rpl_bug31583.test
mysql-test/suite/bugs/t/rpl_bug33029.test
mysql-test/suite/bugs/t/rpl_bug38205.test
added:
include/mysql/thread_pool_priv.h
libmysql/authentication_win/
libmysql/authentication_win/CMakeLists.txt
libmysql/authentication_win/common.cc
libmysql/authentication_win/common.h
libmysql/authentication_win/handshake.cc
libmysql/authentication_win/handshake.h
libmysql/authentication_win/handshake_client.cc
libmysql/authentication_win/log_client.cc
libmysql/authentication_win/plugin_client.cc
mysql-test/include/not_threadpool.inc
mysql-test/lib/mtr_results.pm
mysql-test/r/archive_debug.result
mysql-test/r/implicit_char_to_num_conversion.result
mysql-test/r/mysql_embedded.result
mysql-test/r/secure_file_priv_win.result
mysql-test/r/status_bug17954.result
mysql-test/suite/binlog/r/binlog_reset_master.result
mysql-test/suite/binlog/t/binlog_reset_master.test
mysql-test/suite/innodb/r/innodb_bug59410.result
mysql-test/suite/innodb/r/innodb_bug59641.result
mysql-test/suite/innodb/r/innodb_index_large_prefix.result
mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result
mysql-test/suite/innodb/t/innodb_bug59410.test
mysql-test/suite/innodb/t/innodb_bug59641.test
mysql-test/suite/innodb/t/innodb_index_large_prefix.test
mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
mysql-test/suite/ndb/ndb_config_threadconfig.ini
mysql-test/suite/ndb/r/ndb_alter_table_error.result
mysql-test/suite/ndb/r/ndb_dist_priv.result
mysql-test/suite/ndb/t/have_ndb_dist_priv.inc
mysql-test/suite/ndb/t/ndb_alter_table_error.test
mysql-test/suite/ndb/t/ndb_dist_priv.test
mysql-test/suite/rpl/t/rpl_typeconv-master.opt
mysql-test/suite/rpl_ndb/r/rpl_ndb_dist_priv.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_dist_priv.test
mysql-test/t/archive_debug.test
mysql-test/t/implicit_char_to_num_conversion.test
mysql-test/t/mysql_embedded.test
mysql-test/t/secure_file_priv_win-master.opt
mysql-test/t/secure_file_priv_win.test
mysql-test/t/status_bug17954.test
sql/ndb_dist_priv_util.h
storage/ndb/src/kernel/vm/mt_thr_config.cpp
storage/ndb/src/kernel/vm/mt_thr_config.hpp
storage/ndb/tools/HOWTO_distribute_privileges.txt
storage/ndb/tools/ndb_dist_priv.sql
renamed:
mysql-test/suite/bugs/r/rpl_bug23533.result => mysql-test/suite/binlog/r/binlog_bug23533.result
mysql-test/suite/bugs/r/rpl_bug36391.result => mysql-test/suite/binlog/r/binlog_bug36391.result
mysql-test/suite/bugs/r/rpl_bug37426.result => mysql-test/suite/rpl/r/rpl_bug37426.result
mysql-test/suite/bugs/t/rpl_bug23533.test => mysql-test/suite/binlog/t/binlog_bug23533.test
mysql-test/suite/bugs/t/rpl_bug36391-master.opt => mysql-test/suite/binlog/t/binlog_bug36391-master.opt
mysql-test/suite/bugs/t/rpl_bug36391.test => mysql-test/suite/binlog/t/binlog_bug36391.test
mysql-test/suite/bugs/t/rpl_bug37426.test => mysql-test/suite/rpl/t/rpl_bug37426.test
modified:
.bzrignore
BUILD-CMAKE
BUILD/FINISH.sh
BUILD/SETUP.sh
BUILD/autorun.sh
BUILD/build_mccge.sh
BUILD/cmake_configure.sh
BUILD/compile-dist
BUILD/compile-ia64-debug-max
BUILD/compile-pentium-debug
BUILD/compile-pentium-debug-max
BUILD/compile-pentium-debug-openssl
BUILD/compile-pentium-debug-yassl
BUILD/compile-pentium64-debug
BUILD/compile-pentium64-debug-max
CMakeLists.txt
VERSION
client/client_priv.h
client/completion_hash.cc
client/mysql.cc
client/mysql_upgrade.c
client/mysqladmin.cc
client/mysqlbinlog.cc
client/mysqlcheck.c
client/mysqldump.c
client/mysqlimport.c
client/mysqlshow.c
client/mysqlslap.c
client/mysqltest.cc
client/sql_string.h
cmake/abi_check.cmake
cmake/bison.cmake
cmake/build_configurations/mysql_release.cmake
cmake/cat.cmake
cmake/check_minimal_version.cmake
cmake/cmake_parse_arguments.cmake
cmake/configure.pl
cmake/cpack_source_ignore_files.cmake
cmake/create_initial_db.cmake.in
cmake/do_abi_check.cmake
cmake/dtrace.cmake
cmake/dtrace_prelink.cmake
cmake/install_layout.cmake
cmake/install_macros.cmake
cmake/libutils.cmake
cmake/maintainer.cmake
cmake/make_dist.cmake.in
cmake/merge_archives_unix.cmake.in
cmake/mysql_add_executable.cmake
cmake/mysql_version.cmake
cmake/os/AIX.cmake
cmake/os/Cygwin.cmake
cmake/os/Darwin.cmake
cmake/os/HP-UX.cmake
cmake/os/Linux.cmake
cmake/os/OS400.cmake
cmake/os/SunOS.cmake
cmake/os/Windows.cmake
cmake/os/WindowsCache.cmake
cmake/package_name.cmake
cmake/plugin.cmake
cmake/readline.cmake
cmake/ssl.cmake
cmake/stack_direction.c
cmake/versioninfo.rc.in
cmake/zlib.cmake
cmd-line-utils/libedit/el.c
cmd-line-utils/libedit/vi.c
cmd-line-utils/readline/CMakeLists.txt
config.h.cmake
configure.cmake
dbug/dbug.c
dbug/dbug_add_tags.pl
extra/comp_err.c
extra/innochecksum.c
extra/my_print_defaults.c
extra/mysql_waitpid.c
extra/perror.c
extra/replace.c
extra/resolve_stack_dump.c
extra/resolveip.c
extra/yassl/include/yassl_int.hpp
extra/yassl/src/socket_wrapper.cpp
extra/yassl/src/yassl_error.cpp
extra/yassl/src/yassl_int.cpp
extra/yassl/taocrypt/include/misc.hpp
extra/yassl/taocrypt/src/random.cpp
include/CMakeLists.txt
include/atomic/gcc_builtins.h
include/atomic/generic-msvc.h
include/atomic/nolock.h
include/atomic/rwlock.h
include/atomic/solaris.h
include/atomic/x86-gcc.h
include/decimal.h
include/errmsg.h
include/ft_global.h
include/hash.h
include/heap.h
include/keycache.h
include/lf.h
include/m_ctype.h
include/m_string.h
include/my_aes.h
include/my_alarm.h
include/my_alloc.h
include/my_atomic.h
include/my_attribute.h
include/my_base.h
include/my_bit.h
include/my_bitmap.h
include/my_compiler.h
include/my_dbug.h
include/my_dir.h
include/my_getopt.h
include/my_global.h
include/my_libwrap.h
include/my_list.h
include/my_nosys.h
include/my_rdtsc.h
include/my_stacktrace.h
include/my_sys.h
include/my_time.h
include/my_tree.h
include/my_uctype.h
include/myisam.h
include/myisammrg.h
include/myisampack.h
include/mysql.h
include/mysql.h.pp
include/mysql/client_plugin.h
include/mysql/client_plugin.h.pp
include/mysql/plugin.h
include/mysql/plugin_audit.h
include/mysql/plugin_audit.h.pp
include/mysql/plugin_auth.h
include/mysql/plugin_auth.h.pp
include/mysql/plugin_auth_common.h
include/mysql/plugin_ftparser.h
include/mysql/plugin_ftparser.h.pp
include/mysql/service_my_snprintf.h
include/mysql/service_thd_alloc.h
include/mysql/service_thd_wait.h
include/mysql/service_thread_scheduler.h
include/mysql/services.h
include/mysql_com.h
include/mysql_embed.h
include/mysys_err.h
include/password.h
include/probes_mysql.d.base
include/probes_mysql.h
include/queues.h
include/rijndael.h
include/service_versions.h
include/sha1.h
include/sha2.h
include/sql_common.h
include/sslopt-case.h
include/sslopt-longopts.h
include/sslopt-vars.h
include/thr_alarm.h
include/thr_lock.h
include/violite.h
include/welcome_copyright_notice.h
libmysql/CMakeLists.txt
libmysql/client_settings.h
libmysql/errmsg.c
libmysql/get_password.c
libmysql/libmysql.c
libmysql/libmysql.def
libmysqld/emb_qcache.cc
libmysqld/emb_qcache.h
libmysqld/embedded_priv.h
libmysqld/lib_sql.cc
libmysqld/libmysqld.c
libservices/HOWTO
libservices/my_snprintf_service.c
libservices/my_thread_scheduler_service.c
libservices/thd_alloc_service.c
libservices/thd_wait_service.c
mysql-test/CMakeLists.txt
mysql-test/collections/default.experimental
mysql-test/extra/rpl_tests/check_type.inc
mysql-test/include/default_my.cnf
mysql-test/include/default_mysqld.cnf
mysql-test/include/have_archive_plugin.inc
mysql-test/include/have_blackhole_plugin.inc
mysql-test/include/mtr_check.sql
mysql-test/include/mtr_warnings.sql
mysql-test/include/wait_show_condition.inc
mysql-test/lib/My/ConfigFactory.pm
mysql-test/lib/My/CoreDump.pm
mysql-test/lib/My/Find.pm
mysql-test/lib/My/Handles.pm
mysql-test/lib/My/Options.pm
mysql-test/lib/My/SafeProcess.pm
mysql-test/lib/My/SafeProcess/safe_kill_win.cc
mysql-test/lib/My/SafeProcess/safe_process.pl
mysql-test/lib/My/SafeProcess/safe_process_win.cc
mysql-test/lib/My/Test.pm
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_gcov.pl
mysql-test/lib/mtr_misc.pl
mysql-test/lib/mtr_report.pm
mysql-test/lib/t/Options.t
mysql-test/lib/t/testMyConfigFactory.t
mysql-test/lib/v1/mtr_io.pl
mysql-test/lib/v1/mtr_misc.pl
mysql-test/lib/v1/mtr_report.pl
mysql-test/lib/v1/mysql-test-run.pl
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/ctype_binary.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_utf16.result
mysql-test/r/ctype_utf8.result
mysql-test/r/distinct.result
mysql-test/r/events_1.result
mysql-test/r/events_bugs.result
mysql-test/r/events_restart.result
mysql-test/r/explain.result
mysql-test/r/flush.result
mysql-test/r/func_analyse.result
mysql-test/r/func_group.result
mysql-test/r/func_in.result
mysql-test/r/func_math.result
mysql-test/r/func_time.result
mysql-test/r/gis-rtree.result
mysql-test/r/gis.result
mysql-test/r/having.result
mysql-test/r/innodb_mysql_lock.result
mysql-test/r/innodb_mysql_sync.result
mysql-test/r/loaddata.result
mysql-test/r/metadata.result
mysql-test/r/multi_update.result
mysql-test/r/multi_update_innodb.result
mysql-test/r/mysqlbinlog_base64.result
mysql-test/r/openssl_1.result
mysql-test/r/partition.result
mysql-test/r/partition_datatype.result
mysql-test/r/partition_myisam.result
mysql-test/r/plugin_auth.result
mysql-test/r/query_cache_28249.result
mysql-test/r/query_cache_debug.result
mysql-test/r/sp-security.result
mysql-test/r/sp.result
mysql-test/r/sp_notembedded.result
mysql-test/r/sp_sync.result
mysql-test/r/status.result
mysql-test/r/subselect.result
mysql-test/r/symlink.result
mysql-test/r/trigger-compat.result
mysql-test/r/trigger.result
mysql-test/r/type_datetime.result
mysql-test/r/type_newdecimal.result
mysql-test/r/type_ranges.result
mysql-test/r/type_timestamp.result
mysql-test/r/variables-big.result
mysql-test/r/warnings.result
mysql-test/r/xa.result
mysql-test/r/xml.result
mysql-test/suite/binlog/r/binlog_innodb_row.result
mysql-test/suite/binlog/r/binlog_multi_engine.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/binlog/t/binlog_innodb_row.test
mysql-test/suite/binlog/t/disabled.def
mysql-test/suite/federated/disabled.def
mysql-test/suite/federated/federated.result
mysql-test/suite/innodb/r/innodb-index.result
mysql-test/suite/innodb/r/innodb-use-sys-malloc.result
mysql-test/suite/innodb/r/innodb_bug60196.result
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/suite/innodb/t/innodb-index.test
mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt
mysql-test/suite/innodb/t/innodb-use-sys-malloc.test
mysql-test/suite/innodb/t/innodb_bug60196.test
mysql-test/suite/innodb/t/innodb_mysql.test
mysql-test/suite/ndb/include/ndb_add_node_mysqld.cnf
mysql-test/suite/ndb/my.cnf
mysql-test/suite/ndb/r/ndb_basic.result
mysql-test/suite/ndb/r/ndb_blob_big.result
mysql-test/suite/ndb/r/ndb_config.result
mysql-test/suite/ndb/r/ndb_dd_alter.result
mysql-test/suite/ndb/r/ndb_index_stat.result
mysql-test/suite/ndb/r/ndb_join_pushdown.result
mysql-test/suite/ndb/r/ndb_read_multi_range.result
mysql-test/suite/ndb/r/ndb_statistics1.result
mysql-test/suite/ndb/r/ndb_update_no_read.result
mysql-test/suite/ndb/t/clusterj_jpa.test
mysql-test/suite/ndb/t/ndb_addnode.cnf
mysql-test/suite/ndb/t/ndb_basic.test
mysql-test/suite/ndb/t/ndb_blob_big.test
mysql-test/suite/ndb/t/ndb_config.test
mysql-test/suite/ndb/t/ndb_index_stat.test
mysql-test/suite/ndb/t/ndb_join_pushdown.test
mysql-test/suite/ndb/t/ndb_read_multi_range.test
mysql-test/suite/ndb/t/ndb_update_no_read.test
mysql-test/suite/ndb_binlog/my.cnf
mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.cnf
mysql-test/suite/ndb_rpl/my.cnf
mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result
mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf
mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test
mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_1.inc
mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf
mysql-test/suite/ndb_team/my.cnf
mysql-test/suite/parts/inc/partition_check_drop.inc
mysql-test/suite/parts/inc/partition_fail.inc
mysql-test/suite/parts/inc/partition_layout_check1.inc
mysql-test/suite/parts/inc/partition_layout_check2.inc
mysql-test/suite/perfschema/include/cleanup_helper.inc
mysql-test/suite/perfschema/include/privilege.inc
mysql-test/suite/perfschema/include/start_server_common.inc
mysql-test/suite/perfschema/include/upgrade_check.inc
mysql-test/suite/perfschema/r/relaylog.result
mysql-test/suite/perfschema/r/selects.result
mysql-test/suite/perfschema/t/cnf_option.cnf
mysql-test/suite/perfschema/t/disabled.def
mysql-test/suite/perfschema/t/no_threads.test
mysql-test/suite/perfschema/t/one_thread_per_con.test
mysql-test/suite/perfschema/t/relaylog.test
mysql-test/suite/perfschema/t/selects.test
mysql-test/suite/perfschema_stress/README
mysql-test/suite/perfschema_stress/include/settings.inc
mysql-test/suite/rpl/r/rpl_loaddatalocal.result
mysql-test/suite/rpl/r/rpl_relayspace.result
mysql-test/suite/rpl/r/rpl_server_id2.result
mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_loaddatalocal.test
mysql-test/suite/rpl/t/rpl_relayspace.test
mysql-test/suite/rpl/t/rpl_row_until.test
mysql-test/suite/rpl/t/rpl_server_id2.test
mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
mysql-test/suite/rpl_ndb/my.cnf
mysql-test/suite/sys_vars/r/all_vars.result
mysql-test/suite/sys_vars/t/all_vars.test
mysql-test/suite/sys_vars/t/disabled.def
mysql-test/suite/sys_vars/t/slow_launch_time_func.test
mysql-test/suite/sys_vars/t/thread_cache_size_func.test
mysql-test/suite/sys_vars/t/wait_timeout_func.test
mysql-test/t/alter_table.test
mysql-test/t/ctype_utf16.test
mysql-test/t/disabled.def
mysql-test/t/distinct.test
mysql-test/t/events_1.test
mysql-test/t/events_bugs.test
mysql-test/t/events_restart.test
mysql-test/t/explain.test
mysql-test/t/flush.test
mysql-test/t/func_analyse.test
mysql-test/t/func_group.test
mysql-test/t/func_in.test
mysql-test/t/func_math.test
mysql-test/t/func_time.test
mysql-test/t/gis-rtree.test
mysql-test/t/gis.test
mysql-test/t/having.test
mysql-test/t/information_schema.test
mysql-test/t/information_schema_db.test
mysql-test/t/innodb_mysql_lock.test
mysql-test/t/innodb_mysql_sync.test
mysql-test/t/kill.test
mysql-test/t/loaddata.test
mysql-test/t/multi_update.test
mysql-test/t/multi_update_innodb.test
mysql-test/t/mysqlbinlog_base64.test
mysql-test/t/mysqlshow.test
mysql-test/t/named_pipe.test
mysql-test/t/no-threads.test
mysql-test/t/partition.test
mysql-test/t/partition_datatype.test
mysql-test/t/partition_myisam.test
mysql-test/t/plugin_auth.test
mysql-test/t/query_cache_28249.test
mysql-test/t/query_cache_debug.test
mysql-test/t/shm.test
mysql-test/t/sp-security.test
mysql-test/t/sp.test
mysql-test/t/sp_notembedded.test
mysql-test/t/sp_sync.test
mysql-test/t/status.test
mysql-test/t/subselect.test
mysql-test/t/symlink.test
mysql-test/t/trigger-compat.test
mysql-test/t/trigger.test
mysql-test/t/type_datetime.test
mysql-test/t/type_newdecimal.test
mysql-test/t/type_timestamp.test
mysql-test/t/variables-big.test
mysql-test/t/warnings.test
mysql-test/t/xa.test
mysql-test/t/xml.test
mysys/CMakeLists.txt
mysys/array.c
mysys/base64.c
mysys/charset-def.c
mysys/charset.c
mysys/checksum.c
mysys/errors.c
mysys/hash.c
mysys/lf_alloc-pin.c
mysys/lf_dynarray.c
mysys/lf_hash.c
mysys/list.c
mysys/mf_cache.c
mysys/mf_dirname.c
mysys/mf_fn_ext.c
mysys/mf_format.c
mysys/mf_getdate.c
mysys/mf_iocache.c
mysys/mf_iocache2.c
mysys/mf_keycache.c
mysys/mf_keycaches.c
mysys/mf_loadpath.c
mysys/mf_pack.c
mysys/mf_path.c
mysys/mf_sort.c
mysys/mf_tempdir.c
mysys/mf_tempfile.c
mysys/mf_unixpath.c
mysys/my_alloc.c
mysys/my_atomic.c
mysys/my_bit.c
mysys/my_bitmap.c
mysys/my_chsize.c
mysys/my_compress.c
mysys/my_copy.c
mysys/my_create.c
mysys/my_delete.c
mysys/my_error.c
mysys/my_file.c
mysys/my_fstream.c
mysys/my_gethwaddr.c
mysys/my_getncpus.c
mysys/my_getwd.c
mysys/my_handler_errors.h
mysys/my_init.c
mysys/my_largepage.c
mysys/my_lib.c
mysys/my_lock.c
mysys/my_lockmem.c
mysys/my_mess.c
mysys/my_mmap.c
mysys/my_new.cc
mysys/my_once.c
mysys/my_open.c
mysys/my_pread.c
mysys/my_pthread.c
mysys/my_quick.c
mysys/my_rdtsc.c
mysys/my_read.c
mysys/my_redel.c
mysys/my_rename.c
mysys/my_seek.c
mysys/my_sleep.c
mysys/my_static.c
mysys/my_static.h
mysys/my_symlink.c
mysys/my_sync.c
mysys/my_thr_init.c
mysys/my_timer_cycles.il
mysys/my_wincond.c
mysys/my_windac.c
mysys/my_winerr.c
mysys/my_winfile.c
mysys/my_winthread.c
mysys/my_write.c
mysys/mysys_priv.h
mysys/ptr_cmp.c
mysys/queues.c
mysys/rijndael.c
mysys/stacktrace.c
mysys/string.c
mysys/test_charset.c
mysys/testhash.c
mysys/thr_alarm.c
mysys/thr_lock.c
mysys/thr_mutex.c
mysys/thr_rwlock.c
mysys/tree.c
packaging/WiX/CMakeLists.txt
packaging/WiX/CPackWixConfig.cmake
packaging/WiX/ca/CMakeLists.txt
packaging/WiX/ca/CustomAction.cpp
packaging/WiX/create_msi.cmake.in
packaging/WiX/custom_ui.wxs
packaging/WiX/extra.wxs.in
packaging/WiX/mysql_server.wxs.in
plugin/audit_null/audit_null.c
plugin/auth/auth_socket.c
plugin/auth/test_plugin.c
plugin/daemon_example/daemon_example.cc
plugin/fulltext/plugin_example.c
plugin/semisync/semisync_master.cc
plugin/semisync/semisync_master.h
plugin/semisync/semisync_master_plugin.cc
plugin/semisync/semisync_slave.cc
plugin/semisync/semisync_slave.h
plugin/semisync/semisync_slave_plugin.cc
scripts/dheadgen.pl
scripts/make_binary_distribution.sh
scripts/make_win_bin_dist
scripts/mysql_config.pl.in
scripts/mysql_config.sh
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_data.sql
scripts/mysql_system_tables_fix.sql
sql-bench/compare-results.sh
sql-common/client.c
sql-common/client_plugin.c
sql-common/my_time.c
sql-common/my_user.c
sql/CMakeLists.txt
sql/authors.h
sql/client_settings.h
sql/contributors.h
sql/debug_sync.cc
sql/debug_sync.h
sql/derror.cc
sql/derror.h
sql/des_key_file.cc
sql/des_key_file.h
sql/discover.cc
sql/discover.h
sql/event_data_objects.cc
sql/event_data_objects.h
sql/event_db_repository.cc
sql/event_db_repository.h
sql/event_parse_data.cc
sql/event_parse_data.h
sql/event_queue.cc
sql/event_queue.h
sql/event_scheduler.cc
sql/event_scheduler.h
sql/events.cc
sql/field.cc
sql/field.h
sql/field_conv.cc
sql/filesort.h
sql/frm_crypt.cc
sql/frm_crypt.h
sql/gen_lex_hash.cc
sql/gstream.cc
sql/gstream.h
sql/ha_ndb_index_stat.cc
sql/ha_ndb_index_stat.h
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
sql/ha_ndbcluster_binlog.cc
sql/ha_ndbcluster_binlog.h
sql/ha_ndbcluster_push.cc
sql/ha_ndbinfo.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/hash_filo.cc
sql/hash_filo.h
sql/hostname.h
sql/init.cc
sql/init.h
sql/item.cc
sql/item.h
sql/item_buff.cc
sql/item_cmpfunc.cc
sql/item_create.cc
sql/item_create.h
sql/item_func.cc
sql/item_geofunc.cc
sql/item_row.cc
sql/item_row.h
sql/item_strfunc.cc
sql/item_subselect.cc
sql/item_subselect.h
sql/item_sum.cc
sql/item_sum.h
sql/item_timefunc.cc
sql/item_timefunc.h
sql/item_xmlfunc.cc
sql/item_xmlfunc.h
sql/key.cc
sql/key.h
sql/keycaches.cc
sql/keycaches.h
sql/lex.h
sql/lock.cc
sql/lock.h
sql/log.cc
sql/log.h
sql/log_event.cc
sql/log_event.h
sql/main.cc
sql/mdl.cc
sql/mdl.h
sql/message.h
sql/mf_iocache.cc
sql/my_decimal.cc
sql/my_decimal.h
sql/mysqld.cc
sql/mysqld.h
sql/mysqld_suffix.h
sql/opt_range.cc
sql/opt_range.h
sql/opt_sum.cc
sql/parse_file.cc
sql/parse_file.h
sql/partition_element.h
sql/partition_info.cc
sql/partition_info.h
sql/password.c
sql/procedure.cc
sql/procedure.h
sql/protocol.cc
sql/protocol.h
sql/records.cc
sql/records.h
sql/repl_failsafe.cc
sql/repl_failsafe.h
sql/replication.h
sql/rpl_filter.cc
sql/rpl_filter.h
sql/rpl_handler.cc
sql/rpl_handler.h
sql/rpl_injector.cc
sql/rpl_injector.h
sql/rpl_mi.cc
sql/rpl_mi.h
sql/rpl_record.cc
sql/rpl_record.h
sql/rpl_record_old.cc
sql/rpl_record_old.h
sql/rpl_reporting.cc
sql/rpl_reporting.h
sql/rpl_rli.cc
sql/rpl_rli.h
sql/rpl_tblmap.cc
sql/rpl_tblmap.h
sql/rpl_utility.cc
sql/rpl_utility.h
sql/scheduler.cc
sql/scheduler.h
sql/set_var.cc
sql/sha2.cc
sql/share/CMakeLists.txt
sql/share/errmsg-utf8.txt
sql/slave.cc
sql/slave.h
sql/sp.cc
sql/sp.h
sql/sp_cache.cc
sql/sp_cache.h
sql/sp_head.cc
sql/sp_head.h
sql/sp_pcontext.cc
sql/sp_pcontext.h
sql/sp_rcontext.cc
sql/sp_rcontext.h
sql/spatial.cc
sql/spatial.h
sql/sql_acl.cc
sql/sql_acl.h
sql/sql_admin.cc
sql/sql_admin.h
sql/sql_alter.cc
sql/sql_alter.h
sql/sql_analyse.cc
sql/sql_analyse.h
sql/sql_array.h
sql/sql_audit.cc
sql/sql_audit.h
sql/sql_base.cc
sql/sql_binlog.cc
sql/sql_binlog.h
sql/sql_bitmap.h
sql/sql_builtin.cc.in
sql/sql_cache.cc
sql/sql_cache.h
sql/sql_callback.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_client.cc
sql/sql_connect.cc
sql/sql_connect.h
sql/sql_const.h
sql/sql_crypt.cc
sql/sql_crypt.h
sql/sql_cursor.h
sql/sql_db.cc
sql/sql_db.h
sql/sql_delete.cc
sql/sql_delete.h
sql/sql_derived.cc
sql/sql_derived.h
sql/sql_do.cc
sql/sql_do.h
sql/sql_error.cc
sql/sql_error.h
sql/sql_handler.cc
sql/sql_handler.h
sql/sql_help.cc
sql/sql_help.h
sql/sql_insert.cc
sql/sql_insert.h
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_list.cc
sql/sql_list.h
sql/sql_load.cc
sql/sql_load.h
sql/sql_locale.cc
sql/sql_locale.h
sql/sql_manager.cc
sql/sql_manager.h
sql/sql_parse.cc
sql/sql_parse.h
sql/sql_partition.cc
sql/sql_partition.h
sql/sql_partition_admin.cc
sql/sql_partition_admin.h
sql/sql_plist.h
sql/sql_plugin.cc
sql/sql_plugin.h
sql/sql_plugin_services.h
sql/sql_prepare.cc
sql/sql_prepare.h
sql/sql_priv.h
sql/sql_profile.cc
sql/sql_profile.h
sql/sql_reload.cc
sql/sql_rename.cc
sql/sql_rename.h
sql/sql_repl.cc
sql/sql_repl.h
sql/sql_select.cc
sql/sql_select.h
sql/sql_servers.cc
sql/sql_servers.h
sql/sql_show.cc
sql/sql_show.h
sql/sql_signal.cc
sql/sql_signal.h
sql/sql_sort.h
sql/sql_string.cc
sql/sql_string.h
sql/sql_table.cc
sql/sql_table.h
sql/sql_tablespace.cc
sql/sql_tablespace.h
sql/sql_test.cc
sql/sql_test.h
sql/sql_time.cc
sql/sql_time.h
sql/sql_trigger.cc
sql/sql_trigger.h
sql/sql_udf.cc
sql/sql_udf.h
sql/sql_union.cc
sql/sql_union.h
sql/sql_update.cc
sql/sql_update.h
sql/sql_view.h
sql/sql_yacc.yy
sql/strfunc.h
sql/structs.h
sql/sys_vars.cc
sql/sys_vars.h
sql/sys_vars_shared.h
sql/table.cc
sql/table.h
sql/thr_malloc.cc
sql/thr_malloc.h
sql/transaction.cc
sql/transaction.h
sql/tzfile.h
sql/tztime.cc
sql/tztime.h
sql/udf_example.c
sql/uniques.cc
sql/unireg.cc
storage/archive/azio.c
storage/archive/ha_archive.cc
storage/archive/ha_archive.h
storage/blackhole/ha_blackhole.cc
storage/blackhole/ha_blackhole.h
storage/csv/ha_tina.cc
storage/csv/ha_tina.h
storage/csv/transparent_file.cc
storage/csv/transparent_file.h
storage/example/ha_example.cc
storage/example/ha_example.h
storage/federated/ha_federated.h
storage/heap/ha_heap.cc
storage/heap/ha_heap.h
storage/heap/heapdef.h
storage/heap/hp_block.c
storage/heap/hp_clear.c
storage/heap/hp_close.c
storage/heap/hp_create.c
storage/heap/hp_hash.c
storage/heap/hp_open.c
storage/heap/hp_panic.c
storage/heap/hp_rename.c
storage/heap/hp_rkey.c
storage/heap/hp_static.c
storage/heap/hp_test1.c
storage/heap/hp_test2.c
storage/heap/hp_write.c
storage/innobase/btr/btr0btr.c
storage/innobase/btr/btr0cur.c
storage/innobase/buf/buf0buddy.c
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0flu.c
storage/innobase/buf/buf0lru.c
storage/innobase/data/data0data.c
storage/innobase/dict/dict0crea.c
storage/innobase/dict/dict0dict.c
storage/innobase/dict/dict0load.c
storage/innobase/dict/dict0mem.c
storage/innobase/fil/fil0fil.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innobase/handler/handler0alter.cc
storage/innobase/ibuf/ibuf0ibuf.c
storage/innobase/include/btr0btr.h
storage/innobase/include/btr0cur.h
storage/innobase/include/btr0cur.ic
storage/innobase/include/buf0buddy.h
storage/innobase/include/buf0buddy.ic
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0buf.ic
storage/innobase/include/buf0lru.h
storage/innobase/include/buf0types.h
storage/innobase/include/db0err.h
storage/innobase/include/dict0dict.h
storage/innobase/include/dict0dict.ic
storage/innobase/include/dict0load.h
storage/innobase/include/dict0mem.h
storage/innobase/include/ha_prototypes.h
storage/innobase/include/lock0lock.h
storage/innobase/include/lock0lock.ic
storage/innobase/include/log0log.ic
storage/innobase/include/mtr0mtr.ic
storage/innobase/include/os0sync.h
storage/innobase/include/os0thread.h
storage/innobase/include/page0cur.ic
storage/innobase/include/page0page.h
storage/innobase/include/page0page.ic
storage/innobase/include/rem0rec.h
storage/innobase/include/rem0rec.ic
storage/innobase/include/rem0types.h
storage/innobase/include/row0ext.h
storage/innobase/include/row0ext.ic
storage/innobase/include/row0row.h
storage/innobase/include/row0row.ic
storage/innobase/include/row0upd.ic
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0rw.ic
storage/innobase/include/sync0sync.h
storage/innobase/include/trx0sys.h
storage/innobase/include/trx0sys.ic
storage/innobase/include/trx0trx.h
storage/innobase/include/trx0undo.h
storage/innobase/include/univ.i
storage/innobase/include/ut0dbg.h
storage/innobase/include/ut0ut.h
storage/innobase/lock/lock0lock.c
storage/innobase/log/log0log.c
storage/innobase/mtr/mtr0mtr.c
storage/innobase/os/os0file.c
storage/innobase/os/os0sync.c
storage/innobase/os/os0thread.c
storage/innobase/page/page0cur.c
storage/innobase/page/page0page.c
storage/innobase/page/page0zip.c
storage/innobase/rem/rem0rec.c
storage/innobase/row/row0ext.c
storage/innobase/row/row0ins.c
storage/innobase/row/row0merge.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0row.c
storage/innobase/row/row0sel.c
storage/innobase/row/row0upd.c
storage/innobase/row/row0vers.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0rw.c
storage/innobase/sync/sync0sync.c
storage/innobase/trx/trx0rec.c
storage/innobase/trx/trx0roll.c
storage/innobase/trx/trx0sys.c
storage/innobase/trx/trx0trx.c
storage/innobase/trx/trx0undo.c
storage/innobase/ut/ut0ut.c
storage/myisam/ft_boolean_search.c
storage/myisam/ft_nlq_search.c
storage/myisam/ft_parser.c
storage/myisam/ft_static.c
storage/myisam/ft_update.c
storage/myisam/ftdefs.h
storage/myisam/fulltext.h
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.h
storage/myisam/mi_cache.c
storage/myisam/mi_changed.c
storage/myisam/mi_check.c
storage/myisam/mi_close.c
storage/myisam/mi_create.c
storage/myisam/mi_dbug.c
storage/myisam/mi_delete.c
storage/myisam/mi_delete_all.c
storage/myisam/mi_delete_table.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_extra.c
storage/myisam/mi_extrafunc.h
storage/myisam/mi_info.c
storage/myisam/mi_key.c
storage/myisam/mi_keycache.c
storage/myisam/mi_locking.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_packrec.c
storage/myisam/mi_page.c
storage/myisam/mi_panic.c
storage/myisam/mi_preload.c
storage/myisam/mi_range.c
storage/myisam/mi_rename.c
storage/myisam/mi_rkey.c
storage/myisam/mi_rnext.c
storage/myisam/mi_rnext_same.c
storage/myisam/mi_rprev.c
storage/myisam/mi_rsame.c
storage/myisam/mi_search.c
storage/myisam/mi_static.c
storage/myisam/mi_statrec.c
storage/myisam/mi_test1.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/mi_unique.c
storage/myisam/mi_update.c
storage/myisam/mi_write.c
storage/myisam/myisam_ftdump.c
storage/myisam/myisamdef.h
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisam/rt_split.c
storage/myisam/rt_test.c
storage/myisam/sort.c
storage/myisam/sp_key.c
storage/myisam/sp_test.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/ha_myisammrg.h
storage/myisammrg/myrg_close.c
storage/myisammrg/myrg_create.c
storage/myisammrg/myrg_def.h
storage/myisammrg/myrg_extra.c
storage/myisammrg/myrg_info.c
storage/myisammrg/myrg_queue.c
storage/myisammrg/myrg_rkey.c
storage/myisammrg/myrg_static.c
storage/ndb/VERSION
storage/ndb/clusterj/CMakeLists.txt
storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java
storage/ndb/clusterj/clusterj-core/src/main/resources/com/mysql/clusterj/core/Bundle.properties
storage/ndb/clusterj/clusterj-jdbc/src/main/resources/com/mysql/clusterj/jdbc/Bundle.properties
storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java
storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
storage/ndb/clusterj/pom.xml
storage/ndb/config/type_JAVA.cmake
storage/ndb/include/kernel/signaldata/QueryTree.hpp
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
storage/ndb/include/mgmapi/mgmapi_config_parameters.h
storage/ndb/include/ndbapi/NdbReceiver.hpp
storage/ndb/include/util/SparseBitmask.hpp
storage/ndb/ndb_configure.cmake
storage/ndb/src/kernel/SimBlockList.cpp
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
storage/ndb/src/kernel/blocks/lgman.cpp
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
storage/ndb/src/kernel/ndbd.cpp
storage/ndb/src/kernel/vm/CMakeLists.txt
storage/ndb/src/kernel/vm/Configuration.cpp
storage/ndb/src/kernel/vm/Configuration.hpp
storage/ndb/src/kernel/vm/SimulatedBlock.cpp
storage/ndb/src/kernel/vm/SimulatedBlock.hpp
storage/ndb/src/kernel/vm/dummy_mt.cpp
storage/ndb/src/kernel/vm/dummy_nonmt.cpp
storage/ndb/src/kernel/vm/mt.cpp
storage/ndb/src/kernel/vm/mt.hpp
storage/ndb/src/mgmsrv/CMakeLists.txt
storage/ndb/src/mgmsrv/ConfigInfo.cpp
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
storage/ndb/src/mgmsrv/Services.cpp
storage/ndb/src/ndbapi/NdbIndexStat.cpp
storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
storage/ndb/src/ndbapi/NdbQueryOperation.cpp
storage/ndb/src/ndbapi/NdbQueryOperation.hpp
storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp
storage/ndb/src/ndbapi/NdbReceiver.cpp
storage/ndb/src/ndbapi/NdbTransaction.cpp
storage/ndb/src/ndbapi/ndberror.c
storage/ndb/test/ndbapi/testBlobs.cpp
storage/ndb/test/run-test/daily-basic-tests.txt
storage/ndb/tools/ndb_config.cpp
storage/ndb/tools/restore/restore_main.cpp
storage/perfschema/pfs.cc
storage/perfschema/pfs_atomic.cc
storage/perfschema/pfs_atomic.h
storage/perfschema/pfs_column_types.h
storage/perfschema/pfs_instr.cc
storage/perfschema/pfs_timer.cc
storage/perfschema/pfs_timer.h
storage/perfschema/table_ews_global_by_event_name.cc
storage/perfschema/table_ews_global_by_event_name.h
storage/perfschema/table_setup_consumers.h
storage/perfschema/table_setup_instruments.h
storage/perfschema/table_setup_timers.h
storage/perfschema/unittest/CMakeLists.txt
storage/perfschema/unittest/conf.txt
storage/perfschema/unittest/pfs-t.cc
storage/perfschema/unittest/pfs_instr-oom-t.cc
storage/perfschema/unittest/pfs_instr-t.cc
storage/perfschema/unittest/pfs_instr_class-oom-t.cc
storage/perfschema/unittest/pfs_instr_class-t.cc
storage/perfschema/unittest/pfs_timer-t.cc
storage/perfschema/unittest/stub_pfs_global.h
storage/perfschema/unittest/stub_print_error.h
strings/bchange.c
strings/bmove_upp.c
strings/conf_to_src.c
strings/ctype-big5.c
strings/ctype-cp932.c
strings/ctype-czech.c
strings/ctype-euc_kr.c
strings/ctype-eucjpms.c
strings/ctype-gb2312.c
strings/ctype-gbk.c
strings/ctype-latin1.c
strings/ctype-mb.c
strings/ctype-simple.c
strings/ctype-sjis.c
strings/ctype-tis620.c
strings/ctype-uca.c
strings/ctype-ucs2.c
strings/ctype-ujis.c
strings/ctype-utf8.c
strings/ctype-win1250ch.c
strings/ctype.c
strings/decimal.c
strings/do_ctype.c
strings/dtoa.c
strings/int2str.c
strings/is_prefix.c
strings/llstr.c
strings/longlong2str.c
strings/my_strchr.c
strings/my_strtoll10.c
strings/my_vsnprintf.c
strings/str2int.c
strings/str_alloc.c
strings/strappend.c
strings/strcend.c
strings/strcont.c
strings/strend.c
strings/strfill.c
strings/strmake.c
strings/strmov.c
strings/strnlen.c
strings/strnmov.c
strings/strxmov.c
strings/strxnmov.c
support-files/dtrace/locktime.d
support-files/dtrace/query-execandqc.d
support-files/dtrace/query-filesort-time.d
support-files/dtrace/query-network-time.d
support-files/dtrace/query-parse-time.d
support-files/dtrace/query-rowops.d
support-files/dtrace/query-time.d
support-files/dtrace/statement-time.d
support-files/dtrace/statement-type-aggregate.d
support-files/mysql.spec.sh
support-files/ndb-config-2-node.ini.sh
tests/big_record.pl
tests/bug25714.c
tests/mysql_client_test.c
tests/thread_test.c
unittest/examples/core-t.c
unittest/examples/skip-t.c
unittest/examples/skip_all-t.c
unittest/examples/todo-t.c
unittest/mysys/base64-t.c
unittest/mysys/bitmap-t.c
unittest/mysys/lf-t.c
unittest/mysys/my_atomic-t.c
unittest/mysys/my_rdtsc-t.c
unittest/mysys/my_vsnprintf-t.c
unittest/mysys/thr_template.c
unittest/mytap/t/basic-t.c
unittest/strings/strings-t.c
unittest/unit.pl
vio/test-ssl.c
vio/test-sslclient.c
vio/test-sslserver.c
vio/vio.c
vio/vio_priv.h
vio/viosocket.c
vio/viossl.c
vio/viosslfactories.c
vio/viotest-ssl.c
mysql-test/suite/binlog/r/binlog_bug23533.result
mysql-test/suite/binlog/r/binlog_bug36391.result
mysql-test/suite/rpl/r/rpl_bug37426.result
mysql-test/suite/binlog/t/binlog_bug23533.test
mysql-test/suite/binlog/t/binlog_bug36391.test
mysql-test/suite/rpl/t/rpl_bug37426.test
3446 John David Duncan 2011-09-07 [merge]
Merge from working/mysql-5.5-cluster-memcache
removed:
storage/ndb/src/ndbjtie/mysql/
storage/ndb/src/ndbjtie/mysql/CMakeLists.txt
added:
include/probes_mysql_nodtrace.h
renamed:
storage/ndb/src/ndbjtie/mysql/CharsetMap.cpp => storage/ndb/src/common/util/CharsetMap.cpp
storage/ndb/src/ndbjtie/mysql/CharsetMap.hpp => storage/ndb/include/util/CharsetMap.hpp
storage/ndb/src/ndbjtie/mysql/CharsetMapImpl.cpp => storage/ndb/src/common/util/CharsetMapImpl.cpp
storage/ndb/src/ndbjtie/mysql/CharsetMapImpl.h => storage/ndb/src/common/util/CharsetMapImpl.h
storage/ndb/src/ndbjtie/mysql/decimal_utils.cpp => storage/ndb/src/common/util/decimal_utils.cpp
storage/ndb/src/ndbjtie/mysql/decimal_utils.hpp => storage/ndb/include/util/decimal_utils.hpp
storage/ndb/src/ndbjtie/mysql/test/ => storage/ndb/src/common/util/testMysqlUtils/
modified:
storage/ndb/include/portlib/NdbTCP.h
storage/ndb/memcache/CMakeLists.txt
storage/ndb/memcache/src/DataTypeHandler.cc
storage/ndb/memcache/src/ndb_engine.c
storage/ndb/memcache/src/ndb_worker.cc
storage/ndb/src/CMakeLists.txt
storage/ndb/src/common/util/CMakeLists.txt
storage/ndb/src/ndbjtie/CMakeLists.txt
storage/ndb/include/util/CharsetMap.hpp
3445 John David Duncan 2011-08-19 [merge]
Merge from local working tree
added:
mysql-test/suite/ndb_memcache/r/type_signed.result
mysql-test/suite/ndb_memcache/r/type_unsigned.result
mysql-test/suite/ndb_memcache/t/type_unsigned.test
modified:
mysql-test/lib/My/Memcache.pm
mysql-test/suite/ndb_memcache/t/type_signed.test
storage/ndb/memcache/CMakeLists.txt
storage/ndb/memcache/include/DataTypeHandler.h
storage/ndb/memcache/include/Record.h
storage/ndb/memcache/src/DataTypeHandler.cc
storage/ndb/memcache/src/Record.cc
storage/ndb/memcache/src/schedulers/S_sched.cc
Diff too large for email (57737 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster branch (john.duncan:3445 to 3447) | John David Duncan | 7 Sep |
