From: Tor Didriksen Date: September 28 2011 3:03pm Subject: bzr push into mysql-trunk branch (tor.didriksen:3444 to 3447) List-Archive: http://lists.mysql.com/commits/141187 Message-Id: <201109281503.p8SF3KYO021831@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3447 Tor Didriksen 2011-09-28 [merge] empty merge trunk => opt-backporting 3446 Tor Didriksen 2011-09-28 [merge] NULL merge trunk => opt-backporting 3445 Tor Didriksen 2011-09-28 [merge] Merge trunk => opt-backporting removed: support-files/config.huge.ini.sh support-files/config.medium.ini.sh support-files/config.small.ini.sh support-files/ndb-config-2-node.ini.sh added: mysql-test/r/auth_rpl.result mysql-test/suite/opt_trace/include/filesort_pq.inc mysql-test/suite/opt_trace/r/filesort_pq.result mysql-test/suite/opt_trace/t/filesort_pq.test mysql-test/suite/stress/t/wrapper.test mysql-test/t/auth_rpl-master.opt mysql-test/t/auth_rpl-slave.opt mysql-test/t/auth_rpl.test modified: client/mysql_plugin.c client/mysqltest.cc cmake/mysql_version.cmake cmake/plugin.cmake extra/perror.c include/heap.h include/mysql/plugin.h include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h.pp include/mysql/psi/mysql_socket.h libmysql/authentication_win/common.cc libmysql/authentication_win/common.h libmysql/authentication_win/handshake_client.cc libmysql/authentication_win/log_client.cc libmysql/client_settings.h mysql-test/collections/default.experimental mysql-test/include/mtr_check.sql mysql-test/include/order_by.inc mysql-test/mysql-stress-test.pl mysql-test/mysql-test-run.pl mysql-test/r/ctype_errors.result mysql-test/r/ctype_utf16.result mysql-test/r/ctype_utf32_uca.result mysql-test/r/derived.result mysql-test/r/func_str.result mysql-test/r/group_by.result mysql-test/r/heap.result mysql-test/r/myisampack.result mysql-test/r/mysqltest.result mysql-test/r/order_by_all.result mysql-test/r/order_by_icp_mrr.result mysql-test/r/order_by_none.result mysql-test/r/plugin_auth.result mysql-test/r/query_cache.result mysql-test/r/show_check.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/type_float.result mysql-test/r/union.result mysql-test/r/view_grant.result mysql-test/suite/federated/federated_plugin-master.opt mysql-test/suite/federated/federated_plugin.result mysql-test/suite/federated/federated_plugin.test mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/t/innodb-index.test 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/perfschema/t/socket_instances_func.test mysql-test/suite/perfschema/t/socket_instances_func_win.test mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test mysql-test/suite/rpl/r/rpl_parallel_start_stop.result mysql-test/suite/rpl/r/rpl_row_ignorable_event.result mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result mysql-test/suite/rpl/t/rpl_row_ignorable_event.test mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test mysql-test/t/ctype_errors.test mysql-test/t/ctype_utf32_uca.test mysql-test/t/derived.test mysql-test/t/func_str.test mysql-test/t/group_by.test mysql-test/t/heap.test mysql-test/t/myisampack.test mysql-test/t/mysql_plugin.test mysql-test/t/mysqld--defaults-file.test mysql-test/t/mysqltest.test mysql-test/t/plugin_auth.test mysql-test/t/query_cache.test mysql-test/t/show_check.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/type_float.test mysql-test/t/union.test mysql-test/t/view_grant.test mysql-test/valgrind.supp plugin/audit_null/audit_null.c plugin/auth/auth_socket.c plugin/auth/dialog.c plugin/auth/qa_auth_interface.c plugin/auth/qa_auth_server.c plugin/auth/test_plugin.c plugin/daemon_example/daemon_example.cc plugin/fulltext/plugin_example.c plugin/semisync/semisync_master_plugin.cc plugin/semisync/semisync_slave_plugin.cc sql/binlog.cc sql/client_settings.h sql/filesort.cc sql/ha_ndbcluster.cc sql/ha_partition.cc sql/item_buff.cc sql/item_create.cc sql/item_strfunc.cc sql/item_strfunc.h sql/opt_range.cc sql/opt_trace.h sql/rpl_rli_pdb.cc sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sql_acl.cc sql/sql_base.cc sql/sql_cache.cc sql/sql_error.cc sql/sql_lex.cc sql/sql_plugin.cc sql/sql_select.cc sql/sql_test.cc sql/sql_test.h sql/sql_union.cc sql/sql_update.cc sql/sql_yacc.yy sql/table.cc sql/table.h storage/archive/ha_archive.cc storage/blackhole/ha_blackhole.cc storage/csv/ha_tina.cc storage/example/ha_example.cc storage/federated/ha_federated.cc storage/heap/ha_heap.cc storage/heap/hp_create.c storage/heap/hp_info.c storage/innobase/btr/btr0pcur.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/include/btr0pcur.h storage/innobase/include/btr0pcur.ic storage/innobase/include/mtr0mtr.h storage/innobase/include/srv0mon.h storage/innobase/include/ut0mem.h storage/innobase/include/ut0mem.ic storage/innobase/log/log0log.c storage/innobase/mtr/mtr0mtr.c storage/innobase/os/os0file.c storage/innobase/read/read0read.c storage/innobase/row/row0purge.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0purge.c storage/innobase/ut/ut0mem.c storage/myisam/ft_boolean_search.c storage/myisam/ft_nlq_search.c storage/myisam/ha_myisam.cc storage/myisam/mi_check.c storage/myisam/mi_write.c storage/myisammrg/ha_myisammrg.cc storage/perfschema/ha_perfschema.cc storage/perfschema/pfs.cc storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h strings/dtoa.c support-files/CMakeLists.txt support-files/mysql.spec.sh tests/mysql_client_test.c 3444 Guilhem Bichot 2011-09-26 fix for compilation failure on some platforms modified: unittest/gunit/opt_trace-t.cc Diff too large for email (20354 lines, the limit is 10000). No bundle (reason: useless for push emails).