From: Marc Alff Date: May 16 2011 9:47am Subject: bzr push into mysql-trunk-lock-order branch (marc.alff:3354 to 3355) List-Archive: http://lists.mysql.com/commits/137406 Message-Id: <20110516094719.5065145E71@linux-su11.site> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3355 Marc Alff 2011-05-16 [merge] Merge from trunk removed: extra/yassl/src/template_instnt.cpp extra/yassl/taocrypt/src/template_instnt.cpp mysql-test/suite/bugs/ mysql-test/suite/bugs/combinations mysql-test/suite/bugs/data/ mysql-test/suite/bugs/data/rpl_bug12691.dat mysql-test/suite/bugs/r/ mysql-test/suite/bugs/r/bug57108.result mysql-test/suite/bugs/r/rpl_bug12691.result mysql-test/suite/bugs/r/rpl_bug31582.result mysql-test/suite/bugs/r/rpl_bug31583.result mysql-test/suite/bugs/r/rpl_bug33029.result mysql-test/suite/bugs/r/rpl_bug38205.result mysql-test/suite/bugs/t/ mysql-test/suite/bugs/t/bug57108-master.opt mysql-test/suite/bugs/t/bug57108.test mysql-test/suite/bugs/t/rpl_bug12691.test mysql-test/suite/bugs/t/rpl_bug31582.test mysql-test/suite/bugs/t/rpl_bug31583.test mysql-test/suite/bugs/t/rpl_bug33029.test mysql-test/suite/bugs/t/rpl_bug38205.test mysql-test/suite/sys_vars/r/max_long_data_size_basic.result mysql-test/suite/sys_vars/t/max_long_data_size_basic.test added: libmysql/authentication_win/ libmysql/authentication_win/CMakeLists.txt libmysql/authentication_win/common.cc libmysql/authentication_win/common.h libmysql/authentication_win/handshake.cc libmysql/authentication_win/handshake.h libmysql/authentication_win/handshake_client.cc libmysql/authentication_win/log_client.cc libmysql/authentication_win/plugin_client.cc mysql-test/collections/mysql-trunk-bug27480.push mysql-test/extra/rpl_tests/rpl_temp_error.test mysql-test/include/ipv6_func.inc mysql-test/include/start_slave_io.inc mysql-test/include/start_slave_sql.inc mysql-test/lib/mtr_results.pm mysql-test/r/implicit_char_to_num_conversion.result mysql-test/suite/innodb/r/innodb_bug11933790.result mysql-test/suite/innodb/r/innodb_bug59410.result mysql-test/suite/innodb/r/innodb_bug59641.result mysql-test/suite/innodb/t/innodb_bug11933790.test mysql-test/suite/innodb/t/innodb_bug59410.test mysql-test/suite/innodb/t/innodb_bug59641.test mysql-test/suite/rpl/r/rpl_DML_error.result mysql-test/suite/rpl/t/rpl_DML_error.test mysql-test/t/implicit_char_to_num_conversion.test sql/item_inetfunc.cc sql/item_inetfunc.h storage/innobase/include/srv0conc.h storage/innobase/srv/srv0conc.c unittest/gunit/opt_range-t.cc unittest/gunit/sql_plist-t.cc unittest/gunit/test_utils.cc unittest/gunit/test_utils.h renamed: mysql-test/suite/bugs/r/rpl_bug23533.result => mysql-test/suite/binlog/r/binlog_bug23533.result mysql-test/suite/bugs/r/rpl_bug36391.result => mysql-test/suite/binlog/r/binlog_bug36391.result mysql-test/suite/bugs/r/rpl_bug37426.result => mysql-test/suite/rpl/r/rpl_bug37426.result mysql-test/suite/bugs/t/rpl_bug23533.test => mysql-test/suite/binlog/t/binlog_bug23533.test mysql-test/suite/bugs/t/rpl_bug36391-master.opt => mysql-test/suite/binlog/t/binlog_bug36391-master.opt mysql-test/suite/bugs/t/rpl_bug36391.test => mysql-test/suite/binlog/t/binlog_bug36391.test mysql-test/suite/bugs/t/rpl_bug37426.test => mysql-test/suite/rpl/t/rpl_bug37426.test modified: .bzrignore BUILD/SETUP.sh CMakeLists.txt client/client_priv.h client/mysql.cc* client/mysqlbinlog.cc client/mysqlslap.c client/mysqltest.cc cmake/maintainer.cmake cmake/os/Windows.cmake cmake/os/WindowsCache.cmake cmake/ssl.cmake cmd-line-utils/libedit/el.c cmd-line-utils/libedit/vi.c config.h.cmake configure.cmake extra/replace.c extra/yassl/CMakeLists.txt extra/yassl/src/crypto_wrapper.cpp extra/yassl/src/yassl_int.cpp extra/yassl/taocrypt/CMakeLists.txt extra/yassl/taocrypt/src/algebra.cpp extra/yassl/taocrypt/src/integer.cpp include/m_ctype.h include/my_global.h include/my_net.h include/mysql.h include/mysql.h.pp include/mysql/client_plugin.h include/mysql/client_plugin.h.pp include/mysql/psi/mysql_file.h include/mysql/psi/mysql_stage.h include/mysql/psi/mysql_statement.h include/mysql/psi/mysql_table.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v2.h.pp include/violite.h libmysql/CMakeLists.txt libmysql/libmysql.c libmysql/libmysql.def libmysqld/libmysqld.c mysql-test/collections/default.experimental mysql-test/collections/default.weekly mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test mysql-test/extra/rpl_tests/check_type.inc mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/extra/rpl_tests/rpl_extra_col_slave.test mysql-test/extra/rpl_tests/rpl_innodb.test mysql-test/extra/rpl_tests/rpl_mixing_engines.inc mysql-test/include/ctype_numconv.inc mysql-test/include/func_in.inc mysql-test/include/handler.inc mysql-test/include/ipv6.inc mysql-test/include/join_cache.inc mysql-test/include/mix1.inc mysql-test/include/mtr_warnings.sql mysql-test/include/order_by.inc mysql-test/include/subquery.inc mysql-test/include/subquery_mat.inc mysql-test/include/wait_show_condition.inc mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/Find.pm mysql-test/lib/My/SafeProcess/safe_process.pl mysql-test/lib/My/Test.pm mysql-test/lib/mtr_gcov.pl mysql-test/lib/mtr_misc.pl mysql-test/lib/mtr_report.pm mysql-test/mysql-test-run.pl mysql-test/r/alter_table.result 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/distinct.result mysql-test/r/events_1.result mysql-test/r/events_restart.result mysql-test/r/explain.result mysql-test/r/flush_read_lock.result mysql-test/r/func_analyse.result mysql-test/r/func_group.result mysql-test/r/func_in_icp.result mysql-test/r/func_in_icp_mrr.result mysql-test/r/func_in_mrr.result mysql-test/r/func_in_mrr_cost.result mysql-test/r/func_in_none.result mysql-test/r/func_math.result mysql-test/r/func_misc.result mysql-test/r/func_time.result mysql-test/r/grant.result mysql-test/r/grant2.result mysql-test/r/grant4.result mysql-test/r/handler_innodb.result mysql-test/r/handler_myisam.result mysql-test/r/having.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_mysql_lock.result mysql-test/r/innodb_mysql_sync.result mysql-test/r/ipv4_as_ipv6.result mysql-test/r/ipv6.result mysql-test/r/join_cache_jcl1.result mysql-test/r/join_cache_jcl2.result mysql-test/r/join_cache_jcl3.result mysql-test/r/join_cache_jcl4.result mysql-test/r/join_cache_jcl5.result mysql-test/r/join_cache_jcl6.result mysql-test/r/join_cache_jcl7.result mysql-test/r/join_cache_jcl8.result mysql-test/r/loaddata.result mysql-test/r/lowercase_table2.result mysql-test/r/merge.result mysql-test/r/metadata.result mysql-test/r/myisam_icp_all.result mysql-test/r/mysqlbinlog_base64.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqldump.result mysql-test/r/mysqlslap.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/partition_myisam.result mysql-test/r/plugin_auth.result mysql-test/r/ps_ddl.result mysql-test/r/read_only_innodb.result mysql-test/r/show_check.result mysql-test/r/sp-destruct.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_jcl6.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_jcl6.result mysql-test/r/subquery_none.result mysql-test/r/temp_table.result mysql-test/r/trigger.result mysql-test/r/type_newdecimal.result mysql-test/r/type_ranges.result mysql-test/r/type_timestamp.result mysql-test/r/variables-big.result mysql-test/r/variables.result mysql-test/r/view.result mysql-test/r/warnings.result mysql-test/r/xa.result mysql-test/suite/binlog/r/binlog_innodb_row.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/t/binlog_innodb_row.test mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/innodb/r/innodb_bug60196.result mysql-test/suite/innodb/r/innodb_monitor.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb_bug60196.test mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/suite/parts/inc/partition_check_drop.inc mysql-test/suite/parts/inc/partition_layout_check1.inc mysql-test/suite/parts/inc/partition_layout_check2.inc mysql-test/suite/perfschema/r/column_privilege.result mysql-test/suite/perfschema/r/dml_setup_timers.result mysql-test/suite/perfschema/r/misc.result mysql-test/suite/perfschema/r/start_server_nothing.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/t/column_privilege.test mysql-test/suite/perfschema/t/dml_setup_timers.test mysql-test/suite/perfschema/t/misc.test mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result mysql-test/suite/rpl/r/rpl_crash_safe_master.result mysql-test/suite/rpl/r/rpl_create_if_not_exists.result mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result mysql-test/suite/rpl/r/rpl_loaddatalocal.result mysql-test/suite/rpl/r/rpl_migration_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_rotate_logs.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_row_ignorable_event.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_server_id2.result mysql-test/suite/rpl/r/rpl_show_slave_hosts.result mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_stm_innodb.result mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_typeconv.result mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test mysql-test/suite/rpl/t/rpl_crash_safe_master.test mysql-test/suite/rpl/t/rpl_create_if_not_exists.test mysql-test/suite/rpl/t/rpl_loaddatalocal.test mysql-test/suite/rpl/t/rpl_migration_crash_safe.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_row_ignorable_event.test mysql-test/suite/rpl/t/rpl_row_until.test mysql-test/suite/rpl/t/rpl_server_id2.test mysql-test/suite/rpl/t/rpl_show_slave_hosts.test mysql-test/suite/rpl/t/rpl_typeconv.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/master_info_repository_basic.result mysql-test/suite/sys_vars/r/relay_log_info_repository_basic.result mysql-test/suite/sys_vars/t/master_info_repository_basic.test mysql-test/suite/sys_vars/t/relay_log_info_repository_basic.test mysql-test/t/alter_table.test mysql-test/t/distinct.test mysql-test/t/events_1.test mysql-test/t/events_restart.test mysql-test/t/explain.test mysql-test/t/flush_read_lock.test mysql-test/t/func_analyse.test mysql-test/t/func_group.test mysql-test/t/func_math.test mysql-test/t/func_misc.test mysql-test/t/func_time.test mysql-test/t/grant.test mysql-test/t/grant2.test mysql-test/t/grant4.test mysql-test/t/handler_myisam.test mysql-test/t/having.test mysql-test/t/innodb_mysql_lock.test mysql-test/t/innodb_mysql_sync.test mysql-test/t/ipv4_as_ipv6.test mysql-test/t/ipv6.test mysql-test/t/loaddata.test mysql-test/t/lowercase_table2.test mysql-test/t/merge.test mysql-test/t/mysqlbinlog_base64.test mysql-test/t/mysqlbinlog_raw_mode.test mysql-test/t/mysqldump.test mysql-test/t/mysqlslap.test mysql-test/t/partition_myisam.test mysql-test/t/plugin_auth.test mysql-test/t/ps_ddl.test mysql-test/t/show_check.test mysql-test/t/sp-destruct.test mysql-test/t/temp_table.test mysql-test/t/trigger.test mysql-test/t/type_newdecimal.test mysql-test/t/type_timestamp.test mysql-test/t/variables-big.test mysql-test/t/variables.test mysql-test/t/view.test mysql-test/t/warnings.test mysql-test/t/xa.test mysys/charset.c mysys/default.c mysys/my_init.c mysys/my_thr_init.c mysys/mysys_priv.h plugin/auth/auth_socket.c plugin/semisync/semisync_master_plugin.cc scripts/make_win_bin_dist scripts/mysql_install_db.pl.in scripts/mysql_install_db.sh scripts/mysql_system_tables.sql scripts/mysql_system_tables_fix.sql sql-common/client.c sql-common/client_plugin.c sql-common/my_time.c sql/CMakeLists.txt sql/binlog.cc sql/binlog.h sql/debug_sync.cc sql/event_db_repository.cc sql/events.cc sql/field.cc sql/filesort.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/hostname.cc sql/item.cc sql/item.h sql/item_buff.cc sql/item_cmpfunc.cc sql/item_create.cc sql/item_func.cc sql/item_func.h sql/item_row.cc sql/item_strfunc.cc sql/item_strfunc.h sql/item_sum.cc sql/item_timefunc.cc sql/keycaches.cc sql/log_event.cc sql/mdl.cc sql/mdl.h sql/my_decimal.cc sql/my_decimal.h sql/mysqld.cc sql/mysqld.h sql/opt_range.cc sql/opt_sum.cc sql/protocol.cc sql/rpl_info.cc sql/rpl_info.h sql/rpl_info_factory.cc sql/rpl_info_factory.h sql/rpl_info_file.cc sql/rpl_info_file.h sql/rpl_info_handler.cc sql/rpl_info_handler.h sql/rpl_info_table.cc sql/rpl_info_table.h sql/rpl_info_table_access.cc sql/rpl_info_values.cc sql/rpl_master.cc sql/rpl_mi.cc sql/rpl_mi.h sql/rpl_reporting.cc 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.h sql/sp_cache.cc sql/sp_head.cc sql/sql_acl.cc sql/sql_acl.h sql/sql_admin.cc sql/sql_alter.cc sql/sql_analyse.cc sql/sql_audit.cc sql/sql_base.cc sql/sql_base.h sql/sql_binlog.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_db.cc sql/sql_delete.cc sql/sql_error.cc sql/sql_error.h sql/sql_handler.cc sql/sql_handler.h sql/sql_insert.cc sql/sql_join_cache.cc sql/sql_lex.h sql/sql_load.cc sql/sql_parse.cc sql/sql_parse.h sql/sql_partition.cc sql/sql_partition_admin.cc sql/sql_plist.h sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_priv.h sql/sql_rename.cc sql/sql_select.cc sql/sql_select.h sql/sql_servers.cc sql/sql_show.cc sql/sql_table.cc sql/sql_trigger.cc sql/sql_truncate.cc sql/sql_udf.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/structs.h sql/sys_vars.cc sql/sys_vars.h sql/table.cc sql/table.h sql/transaction.cc sql/tztime.cc 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/ha_heap.h storage/heap/hp_static.c storage/innobase/CMakeLists.txt storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/buf/buf0lru.c storage/innobase/dict/dict0boot.c storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/dict/dict0mem.c storage/innobase/dict/dict0stats.c storage/innobase/fil/fil0fil.c storage/innobase/fsp/fsp0fsp.c storage/innobase/ha/ha0ha.c storage/innobase/ha/hash0hash.c 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.c storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0flu.h storage/innobase/include/buf0lru.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0mem.h storage/innobase/include/dict0mem.ic storage/innobase/include/dict0priv.ic storage/innobase/include/fsp0fsp.h storage/innobase/include/fsp0fsp.ic storage/innobase/include/ha_prototypes.h storage/innobase/include/hash0hash.h storage/innobase/include/log0log.h storage/innobase/include/log0log.ic storage/innobase/include/log0recv.h storage/innobase/include/os0file.h storage/innobase/include/os0sync.h storage/innobase/include/os0thread.h storage/innobase/include/page0types.h storage/innobase/include/page0zip.ic storage/innobase/include/srv0mon.h storage/innobase/include/srv0srv.h storage/innobase/include/sync0arr.h storage/innobase/include/sync0arr.ic 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/trx0roll.h storage/innobase/include/trx0sys.h storage/innobase/include/trx0sys.ic storage/innobase/include/trx0trx.h storage/innobase/include/trx0undo.h storage/innobase/include/univ.i storage/innobase/include/ut0bh.ic storage/innobase/include/ut0dbg.h storage/innobase/include/ut0ut.h storage/innobase/include/ut0vec.h storage/innobase/include/ut0vec.ic storage/innobase/lock/lock0lock.c storage/innobase/lock/lock0wait.c storage/innobase/log/log0log.c storage/innobase/log/log0recv.c storage/innobase/mem/mem0dbg.c storage/innobase/mtr/mtr0log.c storage/innobase/os/os0file.c storage/innobase/os/os0sync.c storage/innobase/os/os0thread.c storage/innobase/page/page0zip.c storage/innobase/que/que0que.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0purge.c storage/innobase/row/row0row.c storage/innobase/row/row0sel.c storage/innobase/row/row0uins.c storage/innobase/row/row0umod.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0mon.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/sync/sync0arr.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0rec.c storage/innobase/trx/trx0roll.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c storage/innobase/trx/trx0undo.c storage/innobase/ut/ut0bh.c storage/innobase/ut/ut0dbg.c storage/innobase/ut/ut0ut.c storage/myisam/ha_myisam.cc storage/myisam/ha_myisam.h storage/myisam/mi_static.c storage/myisam/myisamdef.h storage/myisammrg/ha_myisammrg.cc storage/myisammrg/ha_myisammrg.h storage/myisammrg/myrg_static.c storage/ndb/src/kernel/blocks/lgman.cpp storage/perfschema/ha_perfschema.h storage/perfschema/pfs.cc storage/perfschema/pfs.h storage/perfschema/pfs_atomic.h storage/perfschema/pfs_column_types.h storage/perfschema/pfs_column_values.h storage/perfschema/pfs_con_slice.h storage/perfschema/pfs_defaults.h storage/perfschema/pfs_engine_table.h storage/perfschema/pfs_events_statements.h storage/perfschema/pfs_global.h storage/perfschema/pfs_instr.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_server.h storage/perfschema/pfs_setup_actor.cc storage/perfschema/pfs_setup_object.h storage/perfschema/pfs_timer.cc storage/perfschema/pfs_timer.h storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_instruments.h strings/decimal.c unittest/gunit/CMakeLists.txt unittest/gunit/item-t.cc vio/vio_priv.h vio/viosocket.c mysql-test/suite/binlog/r/binlog_bug23533.result mysql-test/suite/binlog/r/binlog_bug36391.result mysql-test/suite/rpl/r/rpl_bug37426.result mysql-test/suite/binlog/t/binlog_bug23533.test mysql-test/suite/binlog/t/binlog_bug36391.test mysql-test/suite/rpl/t/rpl_bug37426.test 3354 Marc Alff 2011-04-04 [merge] Merge mysql-trunk --> mysql-trunk-lock-order modified: mysql-test/r/func_group.result mysql-test/r/order_by_icp_mrr.result mysql-test/r/order_by_none.result mysql-test/t/func_group.test sql/item.cc sql/item_sum.cc sql/opt_range.cc sql/opt_range.h sql/sql_lex.cc sql/sql_parse.cc sql/sql_select.cc sql/sql_update.cc sql/table.h Diff too large for email (62586 lines, the limit is 10000). No bundle (reason: useless for push emails).