List:Commits« Previous MessageNext Message »
From:Oystein Grovlen Date:March 28 2012 12:57pm
Subject:bzr push into mysql-trunk branch (oystein.grovlen:3696 to 3697)
View as plain text  
 3697 Oystein Grovlen	2012-03-28 [merge]
      Merge from mysql-trunk into mysql-wl6043

    removed:
      BUILD/FINISH.sh
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/check-cpu
      BUILD/cleanup
      BUILD/compile-alpha
      BUILD/compile-amd64-debug-max
      BUILD/compile-amd64-debug-max-no-ndb
      BUILD/compile-amd64-gcov
      BUILD/compile-amd64-gprof
      BUILD/compile-amd64-max
      BUILD/compile-amd64-max-sci
      BUILD/compile-amd64-valgrind-max
      BUILD/compile-hpux11-parisc2-aCC
      BUILD/compile-ia64-debug-max
      BUILD/compile-ndb-autotest
      BUILD/compile-pentium-cybozu
      BUILD/compile-pentium-debug-max-no-embedded
      BUILD/compile-pentium-debug-openssl
      BUILD/compile-pentium-debug-yassl
      BUILD/compile-pentium-max
      BUILD/compile-pentium-myodbc
      BUILD/compile-pentium64-debug
      BUILD/compile-pentium64-debug-max
      BUILD/compile-pentium64-gcov
      BUILD/compile-pentium64-gprof
      BUILD/compile-pentium64-max
      BUILD/compile-pentium64-max-sci
      BUILD/compile-pentium64-valgrind-max
      BUILD/compile-ppc
      BUILD/compile-ppc-debug
      BUILD/compile-ppc-debug-max
      BUILD/compile-ppc-debug-max-no-ndb
      BUILD/compile-ppc-max
      BUILD/compile-solaris-amd64
      BUILD/compile-solaris-amd64-debug
      BUILD/compile-solaris-amd64-forte
      BUILD/compile-solaris-amd64-forte-debug
      BUILD/compile-solaris-sparc
      BUILD/compile-solaris-sparc-debug
      BUILD/compile-solaris-sparc-forte
      BUILD/compile-solaris-sparc-purify
      mysql-test/suite/sys_vars/r/pfs_digests_size.result
      mysql-test/suite/sys_vars/t/pfs_digests_size-master_basic.opt
    added:
      BUILD/README
      cmake/build_configurations/compiler_options.cmake
      cmake/build_configurations/feature_set.cmake
      cmake/libevent.cmake
      libevent/
      libevent/CMakeLists.txt
      libevent/ChangeLog
      libevent/Doxyfile
      libevent/Makefile.am
      libevent/README
      libevent/WIN32-Code/
      libevent/WIN32-Code/event-config.h
      libevent/WIN32-Code/misc.c
      libevent/WIN32-Code/misc.h
      libevent/WIN32-Code/tree.h
      libevent/WIN32-Code/win32.c
      libevent/WIN32-Prj/
      libevent/WIN32-Prj/libevent.dsp
      libevent/WIN32-Prj/libevent.dsw
      libevent/WIN32-Prj/libevent.sln
      libevent/WIN32-Prj/regress/
      libevent/autogen.sh
      libevent/buffer.c
      libevent/compat/
      libevent/compat/sys/
      libevent/compat/sys/_time.h
      libevent/compat/sys/queue.h
      libevent/configure.in
      libevent/devpoll.c
      libevent/epoll.c
      libevent/epoll_sub.c
      libevent/evbuffer.c
      libevent/evdns.3
      libevent/evdns.c
      libevent/evdns.h
      libevent/event-internal.h
      libevent/event.3
      libevent/event.c
      libevent/event.h
      libevent/event_rpcgen.py
      libevent/event_tagging.c
      libevent/evhttp.h
      libevent/evport.c
      libevent/evrpc-internal.h
      libevent/evrpc.c
      libevent/evrpc.h
      libevent/evsignal.h
      libevent/evutil.c
      libevent/evutil.h
      libevent/http-internal.h
      libevent/http.c
      libevent/kqueue.c
      libevent/log.c
      libevent/log.h
      libevent/min_heap.h
      libevent/poll.c
      libevent/sample/
      libevent/sample/Makefile.am
      libevent/sample/event-test.c
      libevent/sample/signal-test.c
      libevent/sample/time-test.c
      libevent/select.c
      libevent/signal.c
      libevent/strlcpy-internal.h
      libevent/strlcpy.c
      libevent/test/
      libevent/test/Makefile.am
      libevent/test/bench.c
      libevent/test/regress.c
      libevent/test/regress.gen.c
      libevent/test/regress.gen.h
      libevent/test/regress.h
      libevent/test/regress.rpc
      libevent/test/regress_dns.c
      libevent/test/regress_http.c
      libevent/test/regress_rpc.c
      libevent/test/test-eof.c
      libevent/test/test-init.c
      libevent/test/test-time.c
      libevent/test/test-weof.c
      libevent/test/test.sh
      mysql-test/include/have_memcached_plugin.inc
      mysql-test/include/search_pattern_in_file.inc
      mysql-test/r/bug12969156.result
      mysql-test/r/disabled_replication.result
      mysql-test/r/ds_mrr-big.result
      mysql-test/r/kill_debug.result
      mysql-test/suite/binlog/r/binlog_row_query_log_events.result
      mysql-test/suite/binlog/t/binlog_row_query_log_events.test
      mysql-test/suite/innodb/r/innodb-index-online-purge.result
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/r/innodb_page_size_func.result
      mysql-test/suite/innodb/t/innodb-index-online-master.opt
      mysql-test/suite/innodb/t/innodb-index-online-purge.test
      mysql-test/suite/innodb/t/innodb-index-online.test
      mysql-test/suite/innodb/t/innodb_page_size_func.test
      mysql-test/suite/perfschema/include/hostcache_set_state.inc
      mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
      mysql-test/suite/rpl/r/rpl_skip_ddl_errors_cli.result
      mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test
      mysql-test/suite/rpl/t/rpl_skip_ddl_errors_cli-slave.opt
      mysql-test/suite/rpl/t/rpl_skip_ddl_errors_cli.test
      mysql-test/suite/sys_vars/r/innodb_api_disable_rowlock_basic.result
      mysql-test/suite/sys_vars/r/innodb_api_enable_binlog_basic.result
      mysql-test/suite/sys_vars/r/innodb_api_enable_mdl_basic.result
      mysql-test/suite/sys_vars/r/innodb_api_trx_level_basic.result
      mysql-test/suite/sys_vars/r/innodb_online_alter_log_max_size_basic.result
      mysql-test/suite/sys_vars/r/pfs_digests_size_basic.result
      mysql-test/suite/sys_vars/t/innodb_api_disable_rowlock_basic.test
      mysql-test/suite/sys_vars/t/innodb_api_enable_binlog_basic.test
      mysql-test/suite/sys_vars/t/innodb_api_enable_mdl_basic.test
      mysql-test/suite/sys_vars/t/innodb_api_trx_level_basic.test
      mysql-test/suite/sys_vars/t/innodb_online_alter_log_max_size_basic.test
      mysql-test/suite/sys_vars/t/pfs_digests_size_basic-master.opt
      mysql-test/t/bug12969156-master.opt
      mysql-test/t/bug12969156.test
      mysql-test/t/disabled_replication-master.opt
      mysql-test/t/disabled_replication.test
      mysql-test/t/ds_mrr-big.test
      mysql-test/t/kill_debug.test
      plugin/innodb_memcached/
      plugin/innodb_memcached/CMakeLists.txt
      plugin/innodb_memcached/README-innodb_memcached
      plugin/innodb_memcached/daemon_memcached/
      plugin/innodb_memcached/daemon_memcached/.gitignore
      plugin/innodb_memcached/daemon_memcached/.mailmap
      plugin/innodb_memcached/daemon_memcached/.shipit
      plugin/innodb_memcached/daemon_memcached/CMakeLists.txt
      plugin/innodb_memcached/daemon_memcached/HACKING
      plugin/innodb_memcached/daemon_memcached/config.h
      plugin/innodb_memcached/daemon_memcached/config_static.h
      plugin/innodb_memcached/daemon_memcached/daemon/
      plugin/innodb_memcached/daemon_memcached/daemon/cache.c
      plugin/innodb_memcached/daemon_memcached/daemon/cache.h
      plugin/innodb_memcached/daemon_memcached/daemon/daemon.c
      plugin/innodb_memcached/daemon_memcached/daemon/hash.c
      plugin/innodb_memcached/daemon_memcached/daemon/hash.h
      plugin/innodb_memcached/daemon_memcached/daemon/isasl.c
      plugin/innodb_memcached/daemon_memcached/daemon/isasl.h
      plugin/innodb_memcached/daemon_memcached/daemon/memcached.c
      plugin/innodb_memcached/daemon_memcached/daemon/memcached.h
      plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.cc
      plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.h
      plugin/innodb_memcached/daemon_memcached/daemon/sasl_defs.c
      plugin/innodb_memcached/daemon_memcached/daemon/sasl_defs.h
      plugin/innodb_memcached/daemon_memcached/daemon/solaris_priv.c
      plugin/innodb_memcached/daemon_memcached/daemon/stats.c
      plugin/innodb_memcached/daemon_memcached/daemon/stats.h
      plugin/innodb_memcached/daemon_memcached/daemon/thread.c
      plugin/innodb_memcached/daemon_memcached/daemon/topkeys.c
      plugin/innodb_memcached/daemon_memcached/daemon/topkeys.h
      plugin/innodb_memcached/daemon_memcached/devtools/
      plugin/innodb_memcached/daemon_memcached/devtools/bench_noreply.pl
      plugin/innodb_memcached/daemon_memcached/devtools/clean-whitespace.pl
      plugin/innodb_memcached/daemon_memcached/devtools/svn-tarballs.pl
      plugin/innodb_memcached/daemon_memcached/doc/
      plugin/innodb_memcached/daemon_memcached/doc/CONTRIBUTORS
      plugin/innodb_memcached/daemon_memcached/doc/Doxyfile
      plugin/innodb_memcached/daemon_memcached/doc/memcached.1
      plugin/innodb_memcached/daemon_memcached/doc/protocol.txt
      plugin/innodb_memcached/daemon_memcached/doc/threads.txt
      plugin/innodb_memcached/daemon_memcached/engines/
      plugin/innodb_memcached/daemon_memcached/engines/default_engine/
      plugin/innodb_memcached/daemon_memcached/engines/default_engine/assoc.c
      plugin/innodb_memcached/daemon_memcached/engines/default_engine/assoc.h
      plugin/innodb_memcached/daemon_memcached/engines/default_engine/default_engine.c
      plugin/innodb_memcached/daemon_memcached/engines/default_engine/default_engine.h
      plugin/innodb_memcached/daemon_memcached/engines/default_engine/items.c
      plugin/innodb_memcached/daemon_memcached/engines/default_engine/items.h
      plugin/innodb_memcached/daemon_memcached/engines/default_engine/slabs.c
      plugin/innodb_memcached/daemon_memcached/engines/default_engine/slabs.h
      plugin/innodb_memcached/daemon_memcached/extensions/
      plugin/innodb_memcached/daemon_memcached/extensions/daemon/
      plugin/innodb_memcached/daemon_memcached/extensions/daemon/stdin_check.c
      plugin/innodb_memcached/daemon_memcached/extensions/loggers/
      plugin/innodb_memcached/daemon_memcached/extensions/loggers/eventlog_logger.c
      plugin/innodb_memcached/daemon_memcached/extensions/loggers/syslog_logger.c
      plugin/innodb_memcached/daemon_memcached/extensions/protocol/
      plugin/innodb_memcached/daemon_memcached/extensions/protocol/ascii_scrub.c
      plugin/innodb_memcached/daemon_memcached/extensions/protocol/example_protocol.c
      plugin/innodb_memcached/daemon_memcached/extensions/protocol_extension.h
      plugin/innodb_memcached/daemon_memcached/include/
      plugin/innodb_memcached/daemon_memcached/include/memcached/
      plugin/innodb_memcached/daemon_memcached/include/memcached/callback.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/config_parser.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/engine.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/engine_common.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/engine_testapp.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/extension.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/extension_loggers.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/genhash.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/protocol_binary.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/protocol_plugin.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/server_api.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/types.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/util.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/vbucket.h
      plugin/innodb_memcached/daemon_memcached/include/memcached/visibility.h
      plugin/innodb_memcached/daemon_memcached/programs/
      plugin/innodb_memcached/daemon_memcached/programs/engine_testapp.c
      plugin/innodb_memcached/daemon_memcached/programs/mcstat.c
      plugin/innodb_memcached/daemon_memcached/programs/mock_server.c
      plugin/innodb_memcached/daemon_memcached/programs/mock_server.h
      plugin/innodb_memcached/daemon_memcached/programs/sizes.c
      plugin/innodb_memcached/daemon_memcached/programs/testapp.c
      plugin/innodb_memcached/daemon_memcached/programs/timedrun.c
      plugin/innodb_memcached/daemon_memcached/scripts/
      plugin/innodb_memcached/daemon_memcached/scripts/README.damemtop
      plugin/innodb_memcached/daemon_memcached/scripts/damemtop
      plugin/innodb_memcached/daemon_memcached/scripts/damemtop.yaml
      plugin/innodb_memcached/daemon_memcached/scripts/memcached-init
      plugin/innodb_memcached/daemon_memcached/scripts/memcached-tool
      plugin/innodb_memcached/daemon_memcached/scripts/memcached.sysv
      plugin/innodb_memcached/daemon_memcached/scripts/start-memcached
      plugin/innodb_memcached/daemon_memcached/t/
      plugin/innodb_memcached/daemon_memcached/t/00-startup.t
      plugin/innodb_memcached/daemon_memcached/t/64bit.t
      plugin/innodb_memcached/daemon_memcached/t/binary-get.t
      plugin/innodb_memcached/daemon_memcached/t/binary-sasl.t
      plugin/innodb_memcached/daemon_memcached/t/binary-sasl.t.in
      plugin/innodb_memcached/daemon_memcached/t/binary.t
      plugin/innodb_memcached/daemon_memcached/t/bogus-commands.t
      plugin/innodb_memcached/daemon_memcached/t/cas.t
      plugin/innodb_memcached/daemon_memcached/t/cmd_extensions.t
      plugin/innodb_memcached/daemon_memcached/t/daemonize.t
      plugin/innodb_memcached/daemon_memcached/t/dash-M.t
      plugin/innodb_memcached/daemon_memcached/t/evictions.t
      plugin/innodb_memcached/daemon_memcached/t/expirations.t
      plugin/innodb_memcached/daemon_memcached/t/flags.t
      plugin/innodb_memcached/daemon_memcached/t/flush-all.t
      plugin/innodb_memcached/daemon_memcached/t/getset.t
      plugin/innodb_memcached/daemon_memcached/t/incrdecr.t
      plugin/innodb_memcached/daemon_memcached/t/issue_104.t
      plugin/innodb_memcached/daemon_memcached/t/issue_108.t
      plugin/innodb_memcached/daemon_memcached/t/issue_14.t
      plugin/innodb_memcached/daemon_memcached/t/issue_140.t
      plugin/innodb_memcached/daemon_memcached/t/issue_152.t
      plugin/innodb_memcached/daemon_memcached/t/issue_163.t
      plugin/innodb_memcached/daemon_memcached/t/issue_22.t
      plugin/innodb_memcached/daemon_memcached/t/issue_29.t
      plugin/innodb_memcached/daemon_memcached/t/issue_3.t
      plugin/innodb_memcached/daemon_memcached/t/issue_41.t
      plugin/innodb_memcached/daemon_memcached/t/issue_42.t
      plugin/innodb_memcached/daemon_memcached/t/issue_50.t
      plugin/innodb_memcached/daemon_memcached/t/issue_61.t
      plugin/innodb_memcached/daemon_memcached/t/issue_67.t
      plugin/innodb_memcached/daemon_memcached/t/issue_68.t
      plugin/innodb_memcached/daemon_memcached/t/issue_70.t
      plugin/innodb_memcached/daemon_memcached/t/item_size_max.t
      plugin/innodb_memcached/daemon_memcached/t/lib/
      plugin/innodb_memcached/daemon_memcached/t/lib/MemcachedTest.pm
      plugin/innodb_memcached/daemon_memcached/t/line-lengths.t
      plugin/innodb_memcached/daemon_memcached/t/lru.t
      plugin/innodb_memcached/daemon_memcached/t/maxconns.t
      plugin/innodb_memcached/daemon_memcached/t/multiversioning.t
      plugin/innodb_memcached/daemon_memcached/t/noreply.t
      plugin/innodb_memcached/daemon_memcached/t/sasl/
      plugin/innodb_memcached/daemon_memcached/t/sasl/memcached.conf
      plugin/innodb_memcached/daemon_memcached/t/scrub.t
      plugin/innodb_memcached/daemon_memcached/t/stats-detail.t
      plugin/innodb_memcached/daemon_memcached/t/stats.t
      plugin/innodb_memcached/daemon_memcached/t/stress-memcached.pl
      plugin/innodb_memcached/daemon_memcached/t/topkeys.t
      plugin/innodb_memcached/daemon_memcached/t/udp.t
      plugin/innodb_memcached/daemon_memcached/t/unixsocket.t
      plugin/innodb_memcached/daemon_memcached/t/verbosity.t
      plugin/innodb_memcached/daemon_memcached/t/whitespace.t
      plugin/innodb_memcached/daemon_memcached/testsuite/
      plugin/innodb_memcached/daemon_memcached/testsuite/basic_engine_testsuite.c
      plugin/innodb_memcached/daemon_memcached/testsuite/basic_engine_testsuite.h
      plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/
      plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/breakdancer.py
      plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/engine_test.py
      plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/suite_stubs.c
      plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/suite_stubs.h
      plugin/innodb_memcached/daemon_memcached/trace.h
      plugin/innodb_memcached/daemon_memcached/utilities/
      plugin/innodb_memcached/daemon_memcached/utilities/config_parser.c
      plugin/innodb_memcached/daemon_memcached/utilities/engine_loader.c
      plugin/innodb_memcached/daemon_memcached/utilities/engine_loader.h
      plugin/innodb_memcached/daemon_memcached/utilities/extension_loggers.c
      plugin/innodb_memcached/daemon_memcached/utilities/genhash.c
      plugin/innodb_memcached/daemon_memcached/utilities/genhash_int.h
      plugin/innodb_memcached/daemon_memcached/utilities/util.c
      plugin/innodb_memcached/daemon_memcached/win32/
      plugin/innodb_memcached/daemon_memcached/win32/Makefile.mingw
      plugin/innodb_memcached/daemon_memcached/win32/config.sh
      plugin/innodb_memcached/daemon_memcached/win32/defs.c
      plugin/innodb_memcached/daemon_memcached/win32/dlfcn.c
      plugin/innodb_memcached/daemon_memcached/win32/dlfcn.h
      plugin/innodb_memcached/daemon_memcached/win32/sysexits.h
      plugin/innodb_memcached/daemon_memcached/win32/win32.c
      plugin/innodb_memcached/daemon_memcached/win32/win32.h
      plugin/innodb_memcached/innodb_memcache/
      plugin/innodb_memcached/innodb_memcache/.gitignore
      plugin/innodb_memcached/innodb_memcache/CMakeLists.txt
      plugin/innodb_memcached/innodb_memcache/cache-src/
      plugin/innodb_memcached/innodb_memcache/cache-src/assoc.c
      plugin/innodb_memcached/innodb_memcache/cache-src/assoc.h
      plugin/innodb_memcached/innodb_memcache/cache-src/default_engine.c
      plugin/innodb_memcached/innodb_memcache/cache-src/default_engine.h
      plugin/innodb_memcached/innodb_memcache/cache-src/hash.h
      plugin/innodb_memcached/innodb_memcache/cache-src/items.c
      plugin/innodb_memcached/innodb_memcache/cache-src/items.h
      plugin/innodb_memcached/innodb_memcache/cache-src/slabs.c
      plugin/innodb_memcached/innodb_memcache/cache-src/slabs.h
      plugin/innodb_memcached/innodb_memcache/cache-src/trace.h
      plugin/innodb_memcached/innodb_memcache/cache-src/util.c
      plugin/innodb_memcached/innodb_memcache/config.h
      plugin/innodb_memcached/innodb_memcache/include/
      plugin/innodb_memcached/innodb_memcache/include/KeyPrefix.h
      plugin/innodb_memcached/innodb_memcache/include/TableSpec.h
      plugin/innodb_memcached/innodb_memcache/include/dbmemcache_global.h
      plugin/innodb_memcached/innodb_memcache/include/debug.h
      plugin/innodb_memcached/innodb_memcache/include/handler_api.h
      plugin/innodb_memcached/innodb_memcache/include/hash_item_util.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_api.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_config.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_list.h
      plugin/innodb_memcached/innodb_memcache/scripts/
      plugin/innodb_memcached/innodb_memcache/scripts/innodb_memcached_config.sql
      plugin/innodb_memcached/innodb_memcache/src/
      plugin/innodb_memcached/innodb_memcache/src/embedded_default_engine.c
      plugin/innodb_memcached/innodb_memcache/src/handler_api.cc
      plugin/innodb_memcached/innodb_memcache/src/hash_item_util.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_config.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h
      plugin/innodb_memcached/innodb_memcache/util-src/
      plugin/innodb_memcached/innodb_memcache/util-src/config_parser.c
      plugin/innodb_memcached/innodb_memcache/util-src/util.c
      storage/innobase/api/
      storage/innobase/api/api0api.cc
      storage/innobase/api/api0misc.cc
      storage/innobase/include/api0api.h
      storage/innobase/include/api0misc.h
      storage/innobase/include/row0log.h
      storage/innobase/row/row0log.cc
    modified:
      .bzrignore
      BUILD/compile-dist
      BUILD/compile-pentium
      BUILD/compile-pentium-debug
      BUILD/compile-pentium-debug-max
      BUILD/compile-pentium-debug-max-no-ndb
      BUILD/compile-pentium-gcov
      BUILD/compile-pentium-gprof
      BUILD/compile-pentium-valgrind-max
      BUILD/compile-pentium-valgrind-max-no-ndb
      BUILD/compile-pentium64
      CMakeLists.txt
      INSTALL-SOURCE
      INSTALL-WIN-SOURCE
      cmake/build_configurations/mysql_release.cmake
      cmake/configure.pl
      cmake/maintainer.cmake
      cmake/make_dist.cmake.in
      cmake/mysql_version.cmake
      cmake/package_name.cmake
      cmake/ssl.cmake
      config.h.cmake
      configure.cmake
      include/my_md5.h
      include/my_time.h
      include/mysql_com.h
      libmysqld/lib_sql.cc
      mysql-test/collections/default.daily
      mysql-test/collections/default.experimental
      mysql-test/collections/default.release.in
      mysql-test/collections/default.weekly
      mysql-test/collections/disabled-per-push.list
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/include/check-testcase.test
      mysql-test/include/commit.inc
      mysql-test/include/mrr_tests.inc
      mysql-test/include/plugin.defs
      mysql-test/include/subquery.inc
      mysql-test/include/subquery_mat.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/mysql-test-run.pl
      mysql-test/r/alter_table.result
      mysql-test/r/archive.result
      mysql-test/r/cast.result
      mysql-test/r/commit_1innodb.result
      mysql-test/r/create.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/r/explain.result
      mysql-test/r/explain_json_all.result
      mysql-test/r/explain_json_none.result
      mysql-test/r/filesort_debug.result
      mysql-test/r/flush_read_lock.result
      mysql-test/r/get_diagnostics.result
      mysql-test/r/innodb_explain_json_non_select_all.result
      mysql-test/r/innodb_explain_json_non_select_none.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/innodb_mrr.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_cost.result
      mysql-test/r/innodb_mrr_cost_all.result
      mysql-test/r/innodb_mrr_cost_icp.result
      mysql-test/r/innodb_mrr_icp.result
      mysql-test/r/innodb_mrr_none.result
      mysql-test/r/innodb_mysql_lock.result
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/r/join_outer.result
      mysql-test/r/join_outer_bka.result
      mysql-test/r/join_outer_bka_nixbnl.result
      mysql-test/r/lock.result
      mysql-test/r/lowercase_table2.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/myisam_explain_json_non_select_all.result
      mysql-test/r/myisam_explain_json_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      mysql-test/r/myisam_mrr.result
      mysql-test/r/myisam_mrr_all.result
      mysql-test/r/myisam_mrr_cost.result
      mysql-test/r/myisam_mrr_cost_all.result
      mysql-test/r/myisam_mrr_cost_icp.result
      mysql-test/r/myisam_mrr_icp.result
      mysql-test/r/myisam_mrr_none.result
      mysql-test/r/mysqlcheck.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/packet.result
      mysql-test/r/partition_debug_sync.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_exchange.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/range_all.result
      mysql-test/r/range_icp.result
      mysql-test/r/range_icp_mrr.result
      mysql-test/r/range_mrr.result
      mysql-test/r/range_mrr_cost.result
      mysql-test/r/range_none.result
      mysql-test/r/read_only_innodb.result
      mysql-test/r/select_all.result
      mysql-test/r/select_all_bka.result
      mysql-test/r/select_all_bka_nixbnl.result
      mysql-test/r/select_icp_mrr.result
      mysql-test/r/select_icp_mrr_bka.result
      mysql-test/r/select_icp_mrr_bka_nixbnl.result
      mysql-test/r/select_none.result
      mysql-test/r/select_none_bka.result
      mysql-test/r/select_none_bka_nixbnl.result
      mysql-test/r/shm.result
      mysql-test/r/sp-bugs.result
      mysql-test/r/sp-code.result
      mysql-test/r/sp-destruct.result
      mysql-test/r/sp_notembedded.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_bka.result
      mysql-test/r/subquery_all_bka_nixbnl.result
      mysql-test/r/subquery_mat.result
      mysql-test/r/subquery_mat_all.result
      mysql-test/r/subquery_mat_none.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_nomat_nosj_bka.result
      mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result
      mysql-test/r/subquery_none.result
      mysql-test/r/subquery_none_bka.result
      mysql-test/r/subquery_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_bka.result
      mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
      mysql-test/r/subquery_sj_dupsweed_bkaunique.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_bka.result
      mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
      mysql-test/r/subquery_sj_firstmatch_bkaunique.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_bka.result
      mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
      mysql-test/r/subquery_sj_loosescan_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bka_nixbnl.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      mysql-test/r/truncate_coverage.result
      mysql-test/r/type_date.result
      mysql-test/r/type_datetime.result
      mysql-test/r/type_time.result
      mysql-test/r/type_timestamp.result
      mysql-test/r/variables-notembedded.result
      mysql-test/r/variables.result
      mysql-test/r/xa.result
      mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result
      mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test
      mysql-test/suite/engines/funcs/t/se_string_having.test
      mysql-test/suite/engines/funcs/t/ta_add_column.test
      mysql-test/suite/engines/funcs/t/ta_add_column_first.test
      mysql-test/suite/engines/funcs/t/ta_add_column_middle.test
      mysql-test/suite/engines/funcs/t/tc_multicolumn_different.test
      mysql-test/suite/funcs_1/r/is_tables_mysql.result
      mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
      mysql-test/suite/funcs_2/t/innodb_charset.test
      mysql-test/suite/innodb/include/innodb_stats.inc
      mysql-test/suite/innodb/r/innodb-autoinc-44030.result
      mysql-test/suite/innodb/r/innodb-autoinc.result
      mysql-test/suite/innodb/r/innodb-index-debug.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb-system-table-view.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_16k.result
      mysql-test/suite/innodb/r/innodb_4k.result
      mysql-test/suite/innodb/r/innodb_8k.result
      mysql-test/suite/innodb/r/innodb_bug-13628249.result
      mysql-test/suite/innodb/r/innodb_bug46000.result
      mysql-test/suite/innodb/r/innodb_bug53591.result
      mysql-test/suite/innodb/r/innodb_bug60049.result
      mysql-test/suite/innodb/r/innodb_index_large_prefix.result
      mysql-test/suite/innodb/r/innodb_index_large_prefix_4k.result
      mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
      mysql-test/suite/innodb/r/innodb_stats.result
      mysql-test/suite/innodb/t/innodb-autoinc-44030.test
      mysql-test/suite/innodb/t/innodb-autoinc.test
      mysql-test/suite/innodb/t/innodb-index-debug.test
      mysql-test/suite/innodb/t/innodb-system-table-view.test
      mysql-test/suite/innodb/t/innodb_16k.test
      mysql-test/suite/innodb/t/innodb_4k.test
      mysql-test/suite/innodb/t/innodb_8k.test
      mysql-test/suite/innodb/t/innodb_bug-13628249.test
      mysql-test/suite/innodb/t/innodb_bug11766634.test
      mysql-test/suite/innodb/t/innodb_bug53591.test
      mysql-test/suite/innodb/t/innodb_index_large_prefix.test
      mysql-test/suite/innodb/t/innodb_index_large_prefix_4k.test
      mysql-test/suite/innodb/t/innodb_index_large_prefix_8k.test
      mysql-test/suite/innodb/t/innodb_monitor.test
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
      mysql-test/suite/innodb_fts/r/fulltext.result
      mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
      mysql-test/suite/innodb_fts/r/innodb-fts-fic.result
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result
      mysql-test/suite/innodb_fts/r/innodb_fts_mutiple_index.result
      mysql-test/suite/innodb_fts/r/innodb_fts_proximity.result
      mysql-test/suite/innodb_fts/r/innodb_fts_transaction.result
      mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
      mysql-test/suite/innodb_fts/t/innodb-fts-fic.test
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      mysql-test/suite/parts/t/partition_alter1_1_innodb.test
      mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test
      mysql-test/suite/parts/t/partition_basic_innodb.test
      mysql-test/suite/parts/t/partition_decimal_myisam.test
      mysql-test/suite/parts/t/partition_int_myisam.test
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_format.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result
      mysql-test/suite/perfschema/r/hostcache_peer_addr.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/r/stage_mdl_table.result
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_format.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test
      mysql-test/suite/perfschema/t/hostcache_peer_addr.test
      mysql-test/suite/perfschema/t/no_threads-master.opt
      mysql-test/suite/rpl/r/rpl_alter_repository.result
      mysql-test/suite/rpl/r/rpl_gtid_mode.result
      mysql-test/suite/rpl/r/rpl_heartbeat.result
      mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result
      mysql-test/suite/rpl/t/rpl_alter_repository.test
      mysql-test/suite/rpl/t/rpl_binlog_errors.test
      mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
      mysql-test/suite/rpl/t/rpl_gtid_parallel.test
      mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test
      mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test
      mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test
      mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
      mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test
      mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/rpl/t/rpl_row_mixing_engines.test
      mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test
      mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
      mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
      mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
      mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test
      mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
      mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
      mysql-test/suite/sys_vars/r/max_allowed_packet_func.result
      mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
      mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
      mysql-test/suite/sys_vars/t/innodb_monitor_disable_basic.test
      mysql-test/suite/sys_vars/t/innodb_monitor_enable_basic.test
      mysql-test/suite/sys_vars/t/innodb_monitor_reset_all_basic.test
      mysql-test/suite/sys_vars/t/innodb_monitor_reset_basic.test
      mysql-test/t/alter_table.test
      mysql-test/t/archive.test
      mysql-test/t/bootstrap-master.opt
      mysql-test/t/create.test
      mysql-test/t/ctype_ucs.test
      mysql-test/t/filesort_debug.test
      mysql-test/t/flush_read_lock.test
      mysql-test/t/innodb_ignore_builtin-master.opt
      mysql-test/t/innodb_mysql_lock.test
      mysql-test/t/innodb_mysql_sync.test
      mysql-test/t/join_outer.test
      mysql-test/t/lock.test
      mysql-test/t/lowercase_table2.test
      mysql-test/t/mdl_sync.test
      mysql-test/t/myisam-blob-master.opt
      mysql-test/t/mysql_embedded-master.opt
      mysql-test/t/partition_debug_sync.test
      mysql-test/t/partition_error.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/sp-bugs.test
      mysql-test/t/sp-code.test
      mysql-test/t/sp_notembedded.test
      mysql-test/t/truncate_coverage.test
      mysql-test/t/type_date.test
      mysql-test/t/type_datetime.test
      mysql-test/t/type_timestamp.test
      mysql-test/t/warnings-master.opt
      mysql-test/t/xa.test
      plugin/daemon_example/daemon_example.cc
      scripts/mysql_system_tables.sql
      sql-common/my_time.c
      sql/binlog.cc
      sql/binlog.h
      sql/debug_sync.cc
      sql/field.cc
      sql/filesort.cc
      sql/filesort_utils.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_geofunc.cc
      sql/item_strfunc.cc
      sql/item_subselect.cc
      sql/item_xmlfunc.cc
      sql/key.cc
      sql/key.h
      sql/log_event.cc
      sql/md5.cc
      sql/mdl.cc
      sql/mdl.h
      sql/mysqld.cc
      sql/opt_explain.cc
      sql/opt_explain_json.cc
      sql/opt_range.cc
      sql/opt_trace.cc
      sql/opt_trace.h
      sql/opt_trace_context.h
      sql/protocol.cc
      sql/rpl_gtid.h
      sql/rpl_gtid_set.cc
      sql/rpl_info.h
      sql/rpl_info_factory.cc
      sql/rpl_master.cc
      sql/rpl_master.h
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/share/errmsg-utf8.txt
      sql/sp.cc
      sql/sp_head.cc
      sql/sp_head.h
      sql/sp_pcontext.h
      sql/sp_rcontext.cc
      sql/sp_rcontext.h
      sql/sql_acl.cc
      sql/sql_admin.cc
      sql/sql_alter.cc
      sql/sql_alter.h
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_executor.cc
      sql/sql_get_diagnostics.cc
      sql/sql_handler.h
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_optimizer.cc
      sql/sql_optimizer.h
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_partition_admin.cc
      sql/sql_planner.cc
      sql/sql_planner.h
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_reload.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_signal.cc
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_trigger.cc
      sql/sql_trigger.h
      sql/sql_truncate.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/transaction.cc
      sql/unireg.cc
      sql/unireg.h
      storage/innobase/CMakeLists.txt
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/btr/btr0sea.cc
      storage/innobase/buf/buf0buf.cc
      storage/innobase/buf/buf0lru.cc
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0opt.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0sea.ic
      storage/innobase/include/buf0lru.h
      storage/innobase/include/buf0types.h
      storage/innobase/include/data0type.h
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0mem.h
      storage/innobase/include/dict0stats.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fts0fts.h
      storage/innobase/include/fts0priv.h
      storage/innobase/include/fts0priv.ic
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/lock0lock.h
      storage/innobase/include/mach0data.h
      storage/innobase/include/mach0data.ic
      storage/innobase/include/mtr0mtr.ic
      storage/innobase/include/os0sync.h
      storage/innobase/include/rem0cmp.h
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/row0ins.h
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0mysql.h
      storage/innobase/include/row0row.h
      storage/innobase/include/row0row.ic
      storage/innobase/include/row0types.h
      storage/innobase/include/row0upd.h
      storage/innobase/include/row0upd.ic
      storage/innobase/include/srv0mon.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0rw.h
      storage/innobase/include/sync0rw.ic
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0purge.h
      storage/innobase/include/trx0rec.h
      storage/innobase/include/trx0trx.h
      storage/innobase/include/ut0vec.ic
      storage/innobase/lock/lock0lock.cc
      storage/innobase/pars/pars0opt.cc
      storage/innobase/pars/pars0pars.cc
      storage/innobase/pars/pars0sym.cc
      storage/innobase/rem/rem0cmp.cc
      storage/innobase/row/row0ftsort.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0purge.cc
      storage/innobase/row/row0row.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/row/row0uins.cc
      storage/innobase/row/row0umod.cc
      storage/innobase/row/row0upd.cc
      storage/innobase/srv/srv0mon.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/sync/sync0sync.cc
      storage/innobase/trx/trx0rec.cc
      storage/innobase/trx/trx0roll.cc
      storage/innobase/ut/ut0ut.cc
      storage/myisam/ha_myisam.cc
      storage/myisammrg/ha_myisammrg.cc
      storage/ndb/CMakeLists.txt
      storage/perfschema/pfs.cc
      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_stat.h
      storage/perfschema/pfs_visitor.cc
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_helper.cc
      storage/perfschema/table_os_global_by_type.cc
      storage/perfschema/table_tiws_by_index_usage.cc
      support-files/CMakeLists.txt
      support-files/build-tags
      support-files/mysql.spec.sh
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
      unittest/gunit/opt_trace-t.cc
 3696 Oystein Grovlen	2012-03-23
      WL#6043 - Optimizations for InnoDB's FTS
      
      Cleanup after merge with trunk.  Better adjustment to new
      wrapping of ORDER object.
     @ sql/sql_optimizer.cc
        Use the added pointer operator to access ORDER object.
     @ sql/sql_optimizer.h
        Add pointer operator to ORDER_with_src class.  Will return the
        wrapped ORDER object.

    modified:
      sql/sql_optimizer.cc
      sql/sql_optimizer.h

Diff too large for email (150475 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (oystein.grovlen:3696 to 3697) Oystein Grovlen28 Mar