3087 Bjorn Munch 2011-07-04 [merge]
null upmerge
3086 Bjorn Munch 2011-07-04 [merge]
merge from trunk
added:
mysql-test/r/mysql_binary_mode.result
mysql-test/suite/sys_vars/r/default_temp_storage_engine_basic.result
mysql-test/suite/sys_vars/t/default_temp_storage_engine_basic.test
mysql-test/t/mysql_binary_mode.test
modified:
BUILD/FINISH.sh
BUILD/autorun.sh
BUILD/build_mccge.sh
BUILD/check-cpu
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-pentium-icc-valgrind-max
BUILD/compile-pentium-valgrind-max
BUILD/compile-pentium64-debug
BUILD/compile-pentium64-debug-max
BUILD/compile-pentium64-valgrind-max
BUILD/compile-solaris-amd64-forte
BUILD/compile-solaris-amd64-forte-debug
BUILD/compile-solaris-sparc
BUILD/compile-solaris-sparc-forte
client/client_priv.h
client/completion_hash.cc
client/my_readline.h
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/readline.cc
client/sql_string.cc
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/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/package_name.cmake
cmake/readline.cmake
cmake/stack_direction.c
cmake/versioninfo.rc.in
cmake/zlib.cmake
cmd-line-utils/readline/CMakeLists.txt
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/cert_wrapper.hpp
extra/yassl/include/openssl/prefix_ssl.h
extra/yassl/include/openssl/ssl.h
extra/yassl/include/openssl/transport_types.h
extra/yassl/include/socket_wrapper.hpp
extra/yassl/include/yassl_error.hpp
extra/yassl/include/yassl_imp.hpp
extra/yassl/include/yassl_int.hpp
extra/yassl/include/yassl_types.hpp
extra/yassl/src/buffer.cpp
extra/yassl/src/cert_wrapper.cpp
extra/yassl/src/crypto_wrapper.cpp
extra/yassl/src/handshake.cpp
extra/yassl/src/socket_wrapper.cpp
extra/yassl/src/ssl.cpp
extra/yassl/src/yassl_error.cpp
extra/yassl/src/yassl_imp.cpp
extra/yassl/src/yassl_int.cpp
extra/yassl/taocrypt/include/asn.hpp
extra/yassl/taocrypt/include/block.hpp
extra/yassl/taocrypt/include/blowfish.hpp
extra/yassl/taocrypt/include/misc.hpp
extra/yassl/taocrypt/include/modes.hpp
extra/yassl/taocrypt/include/runtime.hpp
extra/yassl/taocrypt/src/aes.cpp
extra/yassl/taocrypt/src/algebra.cpp
extra/yassl/taocrypt/src/asn.cpp
extra/yassl/taocrypt/src/blowfish.cpp
extra/yassl/taocrypt/src/coding.cpp
extra/yassl/taocrypt/src/integer.cpp
extra/yassl/taocrypt/src/misc.cpp
extra/yassl/taocrypt/src/random.cpp
extra/yassl/taocrypt/src/twofish.cpp
extra/yassl/testsuite/test.hpp
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/base64.h
include/decimal.h
include/errmsg.h
include/hash.h
include/heap.h
include/keycache.h
include/lf.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_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_time.h
include/my_uctype.h
include/myisam.h
include/myisammrg.h
include/myisampack.h
include/mysql.h
include/mysql/client_plugin.h
include/mysql/plugin.h
include/mysql/plugin_audit.h
include/mysql/plugin_auth.h
include/mysql/plugin_auth_common.h
include/mysql/psi/mysql_file.h
include/mysql/psi/mysql_stage.h
include/mysql/psi/mysql_statement.h
include/mysql/psi/mysql_table.h
include/mysql/psi/mysql_thread.h
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/thread_pool_priv.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/probes_mysql_nodtrace.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/waiting_threads.h
include/welcome_copyright_notice.h
libmysql/client_settings.h
libmysql/errmsg.c
libmysql/get_password.c
libmysqld/emb_qcache.cc
libmysqld/emb_qcache.h
libmysqld/embedded_priv.h
libmysqld/examples/builder-sample/emb_sample.bpr
libmysqld/examples/builder-sample/emb_sample.cpp
libmysqld/examples/builder-sample/emb_samples.cpp
libmysqld/examples/builder-sample/emb_samples.h
libmysqld/libmysqld.c
libservices/CMakeLists.txt
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/include/default_my.cnf
mysql-test/include/default_mysqld.cnf
mysql-test/include/mtr_check.sql
mysql-test/include/mtr_warnings.sql
mysql-test/include/set_binlog_format_mixed.sql
mysql-test/include/set_binlog_format_row.sql
mysql-test/include/set_binlog_format_statement.sql
mysql-test/lib/My/Config.pm
mysql-test/lib/My/ConfigFactory.pm
mysql-test/lib/My/File/Path.pm
mysql-test/lib/My/Find.pm
mysql-test/lib/My/Handles.pm
mysql-test/lib/My/Options.pm
mysql-test/lib/My/Platform.pm
mysql-test/lib/My/SafeProcess.pm
mysql-test/lib/My/SafeProcess/Base.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/SysInfo.pm
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_gprof.pl
mysql-test/lib/mtr_io.pl
mysql-test/lib/mtr_stress.pl
mysql-test/lib/mtr_unique.pm
mysql-test/lib/t/Base.t
mysql-test/lib/t/Find.t
mysql-test/lib/t/Options.t
mysql-test/lib/t/Platform.t
mysql-test/lib/t/SafeProcess.t
mysql-test/lib/t/SafeProcessStress.pl
mysql-test/lib/t/copytree.t
mysql-test/lib/t/dummyd.pl
mysql-test/lib/t/rmtree.t
mysql-test/lib/t/testMyConfig.t
mysql-test/lib/t/testMyConfigFactory.t
mysql-test/lib/t/test_child.pl
mysql-test/lib/v1/My/Config.pm
mysql-test/lib/v1/mtr_cases.pl
mysql-test/lib/v1/mtr_gcov.pl
mysql-test/lib/v1/mtr_gprof.pl
mysql-test/lib/v1/mtr_im.pl
mysql-test/lib/v1/mtr_io.pl
mysql-test/lib/v1/mtr_match.pl
mysql-test/lib/v1/mtr_misc.pl
mysql-test/lib/v1/mtr_process.pl
mysql-test/lib/v1/mtr_report.pl
mysql-test/lib/v1/mtr_stress.pl
mysql-test/lib/v1/mtr_timer.pl
mysql-test/lib/v1/mtr_unique.pl
mysql-test/lib/v1/mysql-test-run.pl
mysql-test/mysql-test-run.pl
mysql-test/r/func_if.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/ps.result
mysql-test/std_data/latin1.xml
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt
mysql-test/suite/innodb/r/innodb-index.result
mysql-test/suite/innodb/t/innodb-index.test
mysql-test/suite/perfschema/include/cleanup_helper.inc
mysql-test/suite/perfschema/include/event_aggregate_setup.inc
mysql-test/suite/perfschema/include/schema.inc
mysql-test/suite/perfschema/include/table_aggregate_load.inc
mysql-test/suite/perfschema/include/table_aggregate_setup.inc
mysql-test/suite/perfschema/include/upgrade_check.inc
mysql-test/suite/perfschema/r/relaylog.result
mysql-test/suite/perfschema/t/part_table_io.test
mysql-test/suite/perfschema/t/relaylog.test
mysql-test/suite/perfschema_stress/README
mysql-test/suite/perfschema_stress/include/settings.inc
mysql-test/t/bootstrap-master.opt
mysql-test/t/bootstrap.test
mysql-test/t/ctype_utf8mb4-master.opt
mysql-test/t/func_if.test
mysql-test/t/ps.test
mysys/CMakeLists.txt
mysys/array.c
mysys/base64.c
mysys/charset-def.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_radix.c
mysys/mf_sort.c
mysys/mf_tempdir.c
mysys/mf_tempfile.c
mysys/mf_unixpath.c
mysys/my_aes.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_conio.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_init.c
mysys/my_largepage.c
mysys/my_lib.c
mysys/my_lock.c
mysys/my_lockmem.c
mysys/my_malloc.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/sha1.c
mysys/stacktrace.c
mysys/string.c
mysys/test_charset.c
mysys/testhash.c
mysys/thr_lock.c
mysys/thr_mutex.c
mysys/thr_rwlock.c
mysys/waiting_threads.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
regex/CMakeLists.txt
scripts/dheadgen.pl
scripts/make_binary_distribution.sh
scripts/make_win_bin_dist
scripts/mysql_config.pl.in
scripts/mysql_config.sh
scripts/mysql_convert_table_format.sh
scripts/mysql_find_rows.sh
scripts/mysql_fix_extensions.sh
scripts/mysql_install_db.pl.in
scripts/mysql_install_db.sh
scripts/mysql_secure_installation.pl.in
scripts/mysql_secure_installation.sh
scripts/mysql_setpermission.sh
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_data.sql
scripts/mysql_system_tables_fix.sql
scripts/mysql_zap.sh
scripts/mysqlaccess.sh
scripts/mysqld_multi.sh
scripts/mysqldumpslow.sh
scripts/mysqlhotcopy.sh
sql-bench/as3ap.sh
sql-bench/bench-count-distinct.sh
sql-bench/bench-init.pl.sh
sql-bench/compare-results.sh
sql-bench/copy-db.sh
sql-bench/crash-me.sh
sql-bench/run-all-tests.sh
sql-bench/server-cfg.sh
sql-bench/test-ATIS.sh
sql-bench/test-alter-table.sh
sql-bench/test-big-tables.sh
sql-bench/test-connect.sh
sql-bench/test-create.sh
sql-bench/test-insert.sh
sql-bench/test-select.sh
sql-bench/test-transactions.sh
sql-bench/test-wisconsin.sh
sql-common/client.c
sql-common/client_plugin.c
sql-common/my_time.c
sql-common/my_user.c
sql/client_settings.h
sql/contributors.h
sql/custom_conf.h
sql/debug_sync.cc
sql/debug_sync.h
sql/des_key_file.cc
sql/event_data_objects.cc
sql/event_db_repository.cc
sql/event_db_repository.h
sql/event_parse_data.cc
sql/event_parse_data.h
sql/event_scheduler.cc
sql/events.cc
sql/field.cc
sql/filesort_utils.cc
sql/filesort_utils.h
sql/gcalc_slicescan.cc
sql/gcalc_slicescan.h
sql/gcalc_tools.cc
sql/gcalc_tools.h
sql/gstream.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/hash_filo.cc
sql/hash_filo.h
sql/item.cc
sql/item_cmpfunc.cc
sql/item_create.cc
sql/item_geofunc.cc
sql/item_row.cc
sql/item_row.h
sql/item_strfunc.cc
sql/item_subselect.h
sql/item_timefunc.cc
sql/item_xmlfunc.h
sql/keycaches.cc
sql/lex_symbol.h
sql/lock.cc
sql/lock.h
sql/log_event.cc
sql/log_event_old.cc
sql/log_event_old.h
sql/main.cc
sql/mdl.h
sql/message.h
sql/mysqld.cc
sql/mysqld.h
sql/mysqld_suffix.h
sql/opt_range.h
sql/opt_sum.cc
sql/password.c
sql/plistsort.c
sql/procedure.cc
sql/records.cc
sql/records.h
sql/rpl_constants.h
sql/rpl_info.cc
sql/rpl_info.h
sql/rpl_info_factory.cc
sql/rpl_info_factory.h
sql/rpl_info_file.cc
sql/rpl_info_file.h
sql/rpl_info_handler.cc
sql/rpl_info_handler.h
sql/rpl_info_table.cc
sql/rpl_info_table.h
sql/rpl_info_table_access.cc
sql/rpl_info_values.cc
sql/rpl_mi.cc
sql/rpl_mi.h
sql/rpl_record_old.cc
sql/rpl_reporting.cc
sql/rpl_reporting.h
sql/rpl_rli.cc
sql/rpl_rli.h
sql/rpl_slave.cc
sql/rpl_slave.h
sql/rpl_utility.h
sql/scheduler.cc
sql/scheduler.h
sql/server_ids.h
sql/share/CMakeLists.txt
sql/share/charsets/cp1251.xml
sql/sp.cc
sql/sp_cache.cc
sql/sp_cache.h
sql/sp_head.cc
sql/sp_pcontext.cc
sql/sp_pcontext.h
sql/sp_rcontext.cc
sql/sp_rcontext.h
sql/spatial.cc
sql/sql_acl.h
sql/sql_admin.cc
sql/sql_admin.h
sql/sql_alloc_error_handler.cc
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_base.h
sql/sql_binlog.cc
sql/sql_builtin.cc.in
sql/sql_cache.cc
sql/sql_callback.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_cmd.h
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_derived.cc
sql/sql_do.cc
sql/sql_error.cc
sql/sql_error.h
sql/sql_handler.cc
sql/sql_handler.h
sql/sql_help.cc
sql/sql_insert.cc
sql/sql_join_cache.cc
sql/sql_lex.cc
sql/sql_list.cc
sql/sql_list.h
sql/sql_load.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_rename.cc
sql/sql_select.cc
sql/sql_servers.cc
sql/sql_show.h
sql/sql_table.cc
sql/sql_test.cc
sql/sql_test.h
sql/sql_trigger.cc
sql/sql_trigger.h
sql/sql_udf.h
sql/sql_union.cc
sql/sql_update.cc
sql/sql_yacc.yy
sql/structs.h
sql/sys_vars.cc
sql/sys_vars.h
sql/table.cc
sql/transaction.h
sql/tzfile.h
sql/tztime.cc
sql/tztime.h
sql/udf_example.c
sql/unireg.cc
storage/archive/archive_reader.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.cc
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_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/include/trx0sys.h
storage/innobase/lock/lock0lock.c
storage/innobase/row/row0row.c
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_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_scan.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/MAINTAINERS
storage/ndb/config/win-lib.am
storage/ndb/config/win-prg.am
storage/ndb/src/kernel/blocks/lgman.cpp
storage/ndb/test/run-test/autotest-boot.sh
storage/ndb/test/run-test/autotest-run.sh
storage/ndb/test/run-test/files.cpp
storage/ndb/test/run-test/setup.cpp
storage/ndb/test/run-test/upgrade-boot.sh
storage/ndb/test/sql/BANK.sql
storage/ndb/test/sql/T1.sql
storage/ndb/test/tools/log_listner.cpp
storage/perfschema/ha_perfschema.cc
storage/perfschema/ha_perfschema.h
storage/perfschema/pfs.cc
storage/perfschema/pfs.h
storage/perfschema/pfs_atomic.h
storage/perfschema/pfs_column_values.cc
storage/perfschema/pfs_column_values.h
storage/perfschema/pfs_con_slice.cc
storage/perfschema/pfs_con_slice.h
storage/perfschema/pfs_defaults.h
storage/perfschema/pfs_engine_table.cc
storage/perfschema/pfs_engine_table.h
storage/perfschema/pfs_events.h
storage/perfschema/pfs_events_stages.cc
storage/perfschema/pfs_events_stages.h
storage/perfschema/pfs_events_statements.cc
storage/perfschema/pfs_events_statements.h
storage/perfschema/pfs_events_waits.cc
storage/perfschema/pfs_events_waits.h
storage/perfschema/pfs_global.h
storage/perfschema/pfs_instr.cc
storage/perfschema/pfs_instr.h
storage/perfschema/pfs_instr_class.cc
storage/perfschema/pfs_instr_class.h
storage/perfschema/pfs_server.cc
storage/perfschema/pfs_server.h
storage/perfschema/pfs_setup_actor.cc
storage/perfschema/pfs_setup_actor.h
storage/perfschema/pfs_setup_object.h
storage/perfschema/pfs_stat.h
storage/perfschema/pfs_timer.cc
storage/perfschema/pfs_timer.h
storage/perfschema/pfs_visitor.cc
storage/perfschema/pfs_visitor.h
storage/perfschema/table_esgs_by_thread_by_event_name.cc
storage/perfschema/table_esgs_by_thread_by_event_name.h
storage/perfschema/table_esgs_global_by_event_name.cc
storage/perfschema/table_esgs_global_by_event_name.h
storage/perfschema/table_esms_by_thread_by_event_name.cc
storage/perfschema/table_esms_by_thread_by_event_name.h
storage/perfschema/table_esms_global_by_event_name.cc
storage/perfschema/table_esms_global_by_event_name.h
storage/perfschema/table_events_stages.cc
storage/perfschema/table_events_stages.h
storage/perfschema/table_events_statements.cc
storage/perfschema/table_events_statements.h
storage/perfschema/table_events_waits.cc
storage/perfschema/table_events_waits.h
storage/perfschema/table_ews_by_thread_by_event_name.cc
storage/perfschema/table_ews_by_thread_by_event_name.h
storage/perfschema/table_ews_global_by_event_name.cc
storage/perfschema/table_ews_global_by_event_name.h
storage/perfschema/table_setup_consumers.cc
storage/perfschema/table_setup_instruments.h
storage/perfschema/table_setup_timers.cc
storage/perfschema/table_tiws_by_index_usage.cc
storage/perfschema/table_tiws_by_index_usage.h
storage/perfschema/unittest/CMakeLists.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
strings/bchange.c
strings/bmove_upp.c
strings/ctype-cp932.c
strings/ctype-eucjpms.c
strings/ctype-extra.c
strings/ctype-mb.c
strings/ctype-ucs2.c
strings/ctype-ujis.c
strings/ctype-win1250ch.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_strtoll10.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
strings/utr11-dump.c
strings/xml.c
support-files/config.huge.ini.sh
support-files/config.medium.ini.sh
support-files/config.small.ini.sh
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/grant.pl
tests/thread_test.c
unittest/examples/skip-t.c
unittest/examples/skip_all-t.c
unittest/examples/todo-t.c
unittest/gunit/CMakeLists.txt
unittest/gunit/FindGTest.cmake
unittest/gunit/gunit_test_main.cc
unittest/gunit/my_bitmap-t.cc
unittest/gunit/sql_list-t.cc
unittest/gunit/tap_event_listener.cc
unittest/gunit/thread_utils-t.cc
unittest/gunit/thread_utils.cc
unittest/gunit/thread_utils.h
unittest/mysys/CMakeLists.txt
unittest/mysys/base64-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/mysys/waiting_threads-t.c
unittest/mytap/t/basic-t.c
unittest/strings/strings-t.c
unittest/unit.pl
vio/CMakeLists.txt
vio/test-ssl.c
vio/test-sslclient.c
vio/test-sslserver.c
vio/viosocket.c
vio/viosslfactories.c
vio/viotest-ssl.c
vio/viotest-sslconnect.cc
vio/viotest.cc
win/create_def_file.js
3085 Bjorn Munch 2011-07-01 [merge]
upmerge 11766640 addendum
modified:
mysql-test/lib/mtr_cases.pm
mysql-test/mysql-test-run.pl
Diff too large for email (16772 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-mtr branch (bjorn.munch:3085 to 3087) | Bjorn Munch | 4 Jul |
