From: Jon Olav Hauglid Date: November 22 2010 9:48am Subject: bzr push into mysql-5.5-runtime branch (jon.hauglid:3195 to 3196) List-Archive: http://lists.mysql.com/commits/124592 Message-Id: <201011220948.oAM9mvUK023460@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3196 Jon Olav Hauglid 2010-11-22 [merge] Merge from mysql-5.5-bugteam to mysql-5.5-runtime No conflicts removed: BUILD/Makefile.am Docs/Makefile.am Makefile.am client/Makefile.am cmake/Makefile.am cmd-line-utils/Makefile.am cmd-line-utils/libedit/Makefile.am cmd-line-utils/readline/Makefile.am config/ config/ac-macros/ config/ac-macros/alloca.m4 config/ac-macros/character_sets.m4 config/ac-macros/check_cpu.m4 config/ac-macros/compiler_flag.m4 config/ac-macros/dtrace.m4 config/ac-macros/large_file.m4 config/ac-macros/maintainer.m4 config/ac-macros/misc.m4 config/ac-macros/plugins.m4 config/ac-macros/readline.m4 config/ac-macros/ssl.m4 config/ac-macros/zlib.m4 configure.in dbug/Makefile.am extra/Makefile.am extra/yassl/Makefile.am extra/yassl/src/Makefile.am extra/yassl/taocrypt/Makefile.am extra/yassl/taocrypt/benchmark/Makefile.am extra/yassl/taocrypt/src/Makefile.am extra/yassl/taocrypt/test/Makefile.am extra/yassl/testsuite/Makefile.am include/Makefile.am libmysql/Makefile.am libmysql/Makefile.shared libmysql/acinclude.m4 libmysql_r/ libmysql_r/Makefile.am libmysqld/Makefile.am libmysqld/examples/Makefile.am libservices/Makefile.am man/Makefile.am mysql-test/Makefile.am mysql-test/lib/My/SafeProcess/Makefile.am mysys/Makefile.am packaging/Makefile.am plugin/Makefile.am plugin/audit_null/Makefile.am plugin/audit_null/plug.in plugin/auth/Makefile.am plugin/auth/plug.in plugin/daemon_example/Makefile.am plugin/daemon_example/configure.in plugin/daemon_example/plug.in plugin/fulltext/Makefile.am plugin/fulltext/configure.in plugin/fulltext/plug.in plugin/semisync/Makefile.am plugin/semisync/configure.in plugin/semisync/plug.in regex/Makefile.am scripts/Makefile.am scripts/make_sharedlib_distribution.sh sql-bench/Makefile.am sql-common/Makefile.am sql/Makefile.am sql/share/Makefile.am storage/Makefile.am storage/archive/Makefile.am storage/archive/plug.in storage/blackhole/Makefile.am storage/blackhole/plug.in storage/csv/Makefile.am storage/csv/plug.in storage/example/Makefile.am storage/example/plug.in storage/federated/Makefile.am storage/federated/plug.in storage/heap/Makefile.am storage/heap/plug.in storage/innobase/Makefile.am storage/innobase/plug.in storage/myisam/Makefile.am storage/myisam/plug.in storage/myisammrg/Makefile.am storage/myisammrg/plug.in storage/perfschema/Makefile.am storage/perfschema/plug.in storage/perfschema/unittest/Makefile.am strings/Makefile.am support-files/MacOSX/Makefile.am support-files/Makefile.am support-files/RHEL4-SElinux/Makefile.am tests/Makefile.am unittest/Makefile.am unittest/examples/Makefile.am unittest/mysys/Makefile.am unittest/mytap/Makefile.am unittest/mytap/t/Makefile.am unittest/strings/Makefile.am vio/Makefile.am win/Makefile.am zlib/Makefile.am added: VERSION storage/perfschema/unittest/stub_server_misc.h modified: BUILD/FINISH.sh BUILD/autorun.sh BUILD/cmake_configure.sh CMakeLists.txt client/mysqltest.cc cmake/build_configurations/mysql_release.cmake cmake/make_dist.cmake.in cmake/mysql_version.cmake cmake/os/Windows.cmake cmake/os/WindowsCache.cmake cmake/versioninfo.rc.in include/m_string.h mysql-test/extra/binlog_tests/binlog_truncate.test mysql-test/extra/binlog_tests/blackhole.test mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test mysql-test/extra/rpl_tests/create_recursive_construct.inc mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test mysql-test/extra/rpl_tests/rpl_insert_delayed.test mysql-test/extra/rpl_tests/rpl_insert_id_pk.test mysql-test/extra/rpl_tests/rpl_not_null.test mysql-test/include/check_slave_is_running.inc mysql-test/include/check_slave_param.inc mysql-test/include/ctype_numconv.inc mysql-test/include/diff_tables.inc mysql-test/include/have_example_plugin.inc mysql-test/include/have_semisync_plugin.inc mysql-test/include/have_simple_parser.inc mysql-test/include/have_udf.inc mysql-test/include/mysql_upgrade_preparation.inc mysql-test/include/no_valgrind_without_big.inc mysql-test/include/not_parallel.inc mysql-test/include/rpl_diff_tables.inc mysql-test/include/setup_fake_relay_log.inc mysql-test/include/show_rpl_debug_info.inc mysql-test/include/truncate_file.inc mysql-test/include/wait_for_slave_io_to_stop.inc mysql-test/include/wait_for_slave_sql_error.inc mysql-test/include/wait_for_slave_sql_to_stop.inc mysql-test/include/wait_for_slave_to_stop.inc mysql-test/include/wait_show_condition.inc mysql-test/mysql-test-run.pl mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_utf8.result mysql-test/r/mysqltest.result mysql-test/r/plugin_auth.result mysql-test/r/xml.result mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/federated/federated_bug_25714.test mysql-test/suite/perfschema_stress/t/modify.test mysql-test/suite/perfschema_stress/t/setup.test mysql-test/suite/perfschema_stress/t/work.test mysql-test/suite/rpl/t/rpl_change_master.test mysql-test/suite/rpl/t/rpl_concurrency_error.test mysql-test/suite/rpl/t/rpl_heartbeat.test mysql-test/suite/rpl/t/rpl_mysql_upgrade.test mysql-test/suite/rpl/t/rpl_semi_sync.test mysql-test/suite/rpl/t/rpl_semi_sync_event.test mysql-test/suite/rpl/t/rpl_slow_query_log.test mysql-test/suite/rpl/t/rpl_ssl.test mysql-test/suite/rpl/t/rpl_sync.test mysql-test/suite/sys_vars/t/slow_launch_time_func.test mysql-test/t/change_user.test mysql-test/t/execution_constants.test mysql-test/t/fix_priv_tables.test mysql-test/t/mysqltest.test mysql-test/t/named_pipe.test mysql-test/t/plugin_auth.test mysql-test/t/shm.test mysql-test/t/system_mysql_db_fix40123.test mysql-test/t/system_mysql_db_fix50030.test mysql-test/t/system_mysql_db_fix50117.test mysql-test/t/xml.test packaging/WiX/create_msi.cmake.in packaging/WiX/mysql_server.wxs.in scripts/mysql_system_tables_fix.sql sql-common/client_plugin.c sql/CMakeLists.txt sql/field.h sql/item.cc sql/mysqld.cc sql/opt_range.cc sql/sql_acl.cc storage/perfschema/pfs_lock.h 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 support-files/CMakeLists.txt support-files/MySQL-shared-compat.spec.sh support-files/my-huge.cnf.sh support-files/my-innodb-heavy-4G.cnf.sh support-files/my-large.cnf.sh support-files/my-medium.cnf.sh support-files/my-small.cnf.sh support-files/mysql.spec.sh unittest/unit.pl win/configure.js 3195 Dmitry Lenev 2010-11-19 [merge] Merged recent change from mysql-5.5-bugteam into mysql-5.5-runtime tree. modified: mysql-test/r/show_check.result mysql-test/t/show_check.test Diff too large for email (15642 lines, the limit is 10000). No bundle (reason: useless for push emails).