List:Commits« Previous MessageNext Message »
From:Serge Kozlov Date:March 30 2012 4:29am
Subject:bzr push into mysql-trunk branch (serge.kozlov:3822 to 3823) Bug#13869905
View as plain text  
 3823 Serge Kozlov	2012-03-30
      Bug#13869905

    modified:
      mysql-test/r/auth_rpl.result
      mysql-test/r/rpl_mysqldump_slave.result
      mysql-test/suite/perfschema/r/relaylog.result
      mysql-test/suite/sys_vars/r/relay_log_basename_basic.result
      mysql-test/suite/sys_vars/r/relay_log_index_basic.result
      mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
      mysql-test/t/auth_rpl.test
 3822 Serge Kozlov	2012-03-29 [merge]
      Bug#13869905

    added:
      BUILD/README
      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/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-delete.result
      mysql-test/suite/innodb/r/innodb_page_size_func.result
      mysql-test/suite/innodb/t/innodb-index-online-delete.test
      mysql-test/suite/innodb/t/innodb_page_size_func.test
      mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
      mysql-test/suite/rpl/r/rpl_parallel_change_master.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_parallel_change_master-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_change_master.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/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/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
    modified:
      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/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/mysql_com.h
      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/include/plugin.defs
      mysql-test/include/subquery.inc
      mysql-test/include/subquery_mat.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/r/grant.result
      mysql-test/r/lowercase_table2.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/ps.result
      mysql-test/r/sp-bugs.result
      mysql-test/r/sp-code.result
      mysql-test/r/sp.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/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_2/t/innodb_charset.test
      mysql-test/suite/innodb/include/innodb_stats.inc
      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.result
      mysql-test/suite/innodb/r/innodb_stats.result
      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.test
      mysql-test/suite/innodb/t/innodb_bug11766634.test
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
      mysql-test/suite/opt_trace/r/charset.result
      mysql-test/suite/opt_trace/r/eq_range_statistics.result
      mysql-test/suite/opt_trace/r/filesort_pq.result
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_all.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_all.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/opt_trace/r/security_no_prot.result
      mysql-test/suite/opt_trace/r/security_ps_prot.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/suite/opt_trace/r/temp_table.result
      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/rpl/r/rpl_alter_repository.result
      mysql-test/suite/rpl/t/rpl_alter_repository.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_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_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/sys_vars/r/relay_log_recovery_basic.result
      mysql-test/suite/sys_vars/t/relay_log_recovery_basic.test
      mysql-test/t/grant.test
      mysql-test/t/lowercase_table2.test
      mysql-test/t/ps.test
      mysql-test/t/sp-bugs.test
      mysql-test/t/sp-code.test
      mysql-test/t/sp.test
      mysql-test/t/sp_notembedded.test
      mysys/lf_alloc-pin.c
      sql/binlog.cc
      sql/binlog.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_partition.cc
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item_subselect.cc
      sql/log_event.cc
      sql/md5.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_explain.cc
      sql/opt_explain_json.cc
      sql/opt_trace.cc
      sql/opt_trace.h
      sql/opt_trace2server.cc
      sql/opt_trace_context.h
      sql/rpl_gtid.h
      sql/rpl_gtid_set.cc
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/share/errmsg-utf8.txt
      sql/sql_acl.cc
      sql/sql_class.h
      sql/sql_executor.cc
      sql/sql_handler.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_optimizer.cc
      sql/sql_planner.cc
      sql/sql_planner.h
      sql/sql_plugin.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      storage/innobase/CMakeLists.txt
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/buf/buf0lru.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/include/btr0btr.h
      storage/innobase/include/buf0lru.h
      storage/innobase/include/buf0types.h
      storage/innobase/include/data0data.h
      storage/innobase/include/data0data.ic
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fts0priv.h
      storage/innobase/include/fts0priv.ic
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/mach0data.h
      storage/innobase/include/mach0data.ic
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0mysql.h
      storage/innobase/rem/rem0rec.cc
      storage/innobase/row/row0ftsort.cc
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/ut/ut0ut.cc
      storage/perfschema/pfs_instr.cc
      strings/ctype-uca.c
      support-files/CMakeLists.txt
      support-files/build-tags
      support-files/mysql.spec.sh
      unittest/gunit/opt_trace-t.cc
=== modified file 'mysql-test/r/auth_rpl.result'
--- a/mysql-test/r/auth_rpl.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/r/auth_rpl.result	2012-03-30 04:28:39 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 [connection slave]
 include/stop_slave.inc
@@ -15,8 +15,8 @@ MASTER_USER=     'plug_user',
 MASTER_PASSWORD= 'plug_user',
 MASTER_RETRY_COUNT= 0;
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 # Slave in-sync with master now.
 SELECT user, plugin, authentication_string FROM mysql.user WHERE user LIKE 'plug_user';
@@ -26,8 +26,8 @@ plug_user	test_plugin_server	plug_user
 include/stop_slave.inc
 CHANGE MASTER TO MASTER_USER='root';
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 DROP USER 'plug_user';
 # Cleanup (on master).
 DROP USER 'plug_user';

=== modified file 'mysql-test/r/rpl_mysqldump_slave.result'
--- a/mysql-test/r/rpl_mysqldump_slave.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/r/rpl_mysqldump_slave.result	2012-03-30 04:28:39 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #
 # New --dump-slave, --apply-slave-statements functionality

=== modified file 'mysql-test/suite/perfschema/r/relaylog.result'
--- a/mysql-test/suite/perfschema/r/relaylog.result	2012-02-08 13:54:11 +0000
+++ b/mysql-test/suite/perfschema/r/relaylog.result	2012-03-30 04:28:39 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists test.t1;
 reset master;

=== modified file 'mysql-test/suite/sys_vars/r/relay_log_basename_basic.result'
--- a/mysql-test/suite/sys_vars/r/relay_log_basename_basic.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/sys_vars/r/relay_log_basename_basic.result	2012-03-30 04:28:39 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 select @@global.relay_log_basename;
 @@global.relay_log_basename

=== modified file 'mysql-test/suite/sys_vars/r/relay_log_index_basic.result'
--- a/mysql-test/suite/sys_vars/r/relay_log_index_basic.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/sys_vars/r/relay_log_index_basic.result	2012-03-30 04:28:39 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 select @@global.relay_log_index;
 @@global.relay_log_index

=== modified file 'mysql-test/suite/sys_vars/r/rpl_init_slave_func.result'
--- a/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result	2012-03-30 04:28:39 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 connection slave
 SET @start_max_connections= @@global.max_connections;

=== modified file 'mysql-test/t/auth_rpl.test'
--- a/mysql-test/t/auth_rpl.test	2011-09-16 12:46:15 +0000
+++ b/mysql-test/t/auth_rpl.test	2012-03-30 04:28:39 +0000
@@ -27,6 +27,7 @@ FLUSH PRIVILEGES;
 --connection slave
 --echo [connection slave]
 --let $master_user= query_get_value(SHOW SLAVE STATUS, Master_User, 1)
+--replace_column 2 ####
 CHANGE MASTER TO 
   MASTER_USER=     'plug_user',
   MASTER_PASSWORD= 'plug_user',
@@ -56,6 +57,7 @@ SELECT user, plugin, authentication_stri
 #
 --echo # Cleanup (on slave).
 --source include/stop_slave.inc
+--replace_column 2 ####
 eval CHANGE MASTER TO MASTER_USER='$master_user';
 DROP USER 'plug_user';
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (serge.kozlov:3822 to 3823) Bug#13869905Serge Kozlov31 Mar