From: Marc Alff Date: February 18 2011 4:14pm Subject: bzr commit into mysql-trunk branch (marc.alff:3212) List-Archive: http://lists.mysql.com/commits/131649 Message-Id: <201102181615.p1IGFZqx001248@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///Users/malff/BZR_TREE/mysql-trunk-wl4813/ based on revid:marc.alff@stripped 3212 Marc Alff 2011-02-18 [merge] Merge mysql-trunk --> mysql-trunk-wl4813 added: cmake/info_bin.cmake cmake/info_macros.cmake.in cmake/info_src.cmake mysql-test/include/execute_with_statistics.inc mysql-test/r/file_contents.result mysql-test/suite/innodb/r/innodb_bug53756.result mysql-test/suite/innodb/r/innodb_bug59307.result mysql-test/suite/innodb/r/innodb_bug60049.result mysql-test/suite/innodb/t/innodb_bug53756-master.opt mysql-test/suite/innodb/t/innodb_bug53756.test mysql-test/suite/innodb/t/innodb_bug59307.test mysql-test/suite/innodb/t/innodb_bug60049-master.opt mysql-test/suite/innodb/t/innodb_bug60049.test mysql-test/suite/sys_vars/r/innodb_change_buffer_max_size_basic.result mysql-test/suite/sys_vars/t/innodb_change_buffer_max_size_basic.test mysql-test/t/file_contents.test renamed: unittest/mysys/bitmap-t.c => unittest/gunit/my_bitmap-t.cc modified: .bzrignore CMakeLists.txt README client/mysql.cc client/sql_string.cc client/sql_string.h cmake/make_dist.cmake.in extra/comp_err.c include/m_ctype.h include/my_bit.h include/my_bitmap.h mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_conflicts.test mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test mysql-test/extra/rpl_tests/rpl_stop_middle_group.test mysql-test/include/check-testcase.test mysql-test/include/subquery_mat.inc mysql-test/include/wait_for_slave_io_error.inc mysql-test/include/wait_for_slave_sql_error.inc mysql-test/mysql-test-run.pl mysql-test/r/ctype_cp1250_ch.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_eucjpms.result mysql-test/r/gis.result mysql-test/r/greedy_optimizer.result mysql-test/r/group_by.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_icp_none.result mysql-test/r/insert_select.result mysql-test/r/myisam_icp_all.result mysql-test/r/ps.result mysql-test/r/select_safe.result mysql-test/r/signal_code.result mysql-test/r/sp-code.result mysql-test/r/sp-error.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/subquery_none_jcl6.result mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_all_jcl6.result mysql-test/r/subquery_sj_all_jcl7.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_dupsweed_jcl6.result mysql-test/r/subquery_sj_dupsweed_jcl7.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_firstmatch_jcl6.result mysql-test/r/subquery_sj_firstmatch_jcl7.result mysql-test/r/subquery_sj_innodb_none.result mysql-test/r/subquery_sj_innodb_none_jcl6.result mysql-test/r/subquery_sj_innodb_none_jcl7.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_jcl6.result mysql-test/r/subquery_sj_loosescan_jcl7.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_jcl6.result mysql-test/r/subquery_sj_mat_jcl7.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none.result mysql-test/r/subquery_sj_none_jcl6.result mysql-test/r/subquery_sj_none_jcl7.result mysql-test/r/trigger.result mysql-test/suite/innodb/r/innodb_monitor.result mysql-test/suite/innodb/t/innodb_information_schema.test mysql-test/suite/innodb/t/innodb_monitor.test mysql-test/suite/perfschema/include/table_aggregate_load.inc mysql-test/suite/perfschema/include/table_aggregate_setup.inc mysql-test/suite/perfschema/r/ortho_iter.result mysql-test/suite/perfschema/r/privilege_table_io.result mysql-test/suite/perfschema/r/start_server_innodb.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/r/start_server_no_stage_class.result mysql-test/suite/perfschema/r/start_server_no_stages_history.result mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result mysql-test/suite/perfschema/r/start_server_no_statements_history.result mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.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_off.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/r/table_lock_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result mysql-test/suite/rpl/r/rpl_binlog_corruption.result mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_row_conflicts.result mysql-test/suite/rpl/r/rpl_show_errors.result mysql-test/suite/rpl/r/rpl_stm_EE_err2.result mysql-test/suite/rpl/r/rpl_stm_conflicts.result mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result mysql-test/suite/rpl/t/rpl_binlog_corruption.test mysql-test/suite/rpl/t/rpl_checksum.test mysql-test/suite/rpl/t/rpl_show_errors.test mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/max_join_size_func.result mysql-test/suite/sys_vars/r/sql_big_selects_func.result mysql-test/suite/sys_vars/t/pfs_events_waits_history_long_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_events_waits_history_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_cond_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_cond_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_file_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_file_handles_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_file_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_mutex_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_mutex_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_rwlock_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_rwlock_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_table_handles_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_table_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_thread_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_thread_instances_basic-master.opt mysql-test/t/ctype_cp1250_ch.test mysql-test/t/ctype_cp1251.test mysql-test/t/ctype_eucjpms.test mysql-test/t/gis.test mysql-test/t/greedy_optimizer.test mysql-test/t/group_by.test mysql-test/t/insert_select.test mysql-test/t/ps.test mysql-test/t/sp-error.test mysql-test/t/trigger.test mysql-test/valgrind.supp mysys/my_bitmap.c sql/item_cmpfunc.cc sql/mysqld.cc sql/rpl_master.cc sql/rpl_slave.cc sql/rpl_slave.h sql/set_var.cc sql/share/errmsg-utf8.txt sql/sp_head.cc sql/sql_acl.cc sql/sql_cmd.h sql/sql_connect.cc sql/sql_connect.h sql/sql_lex.h sql/sql_parse.cc sql/sql_parse.h sql/sql_select.cc sql/sql_string.cc sql/sql_string.h sql/sql_yacc.yy sql/sys_vars.cc storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0sea.c storage/innobase/buf/buf0flu.c storage/innobase/buf/buf0rea.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/dict/dict0mem.c storage/innobase/dict/dict0stats.c storage/innobase/ha/ha0ha.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/handler0alter.cc storage/innobase/handler/i_s.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0btr.h storage/innobase/include/btr0cur.h storage/innobase/include/btr0cur.ic storage/innobase/include/btr0types.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0load.h storage/innobase/include/dict0mem.h storage/innobase/include/dict0priv.ic storage/innobase/include/dict0types.h storage/innobase/include/ha0ha.h storage/innobase/include/ibuf0ibuf.h storage/innobase/include/ibuf0ibuf.ic storage/innobase/include/log0log.ic storage/innobase/include/os0sync.h storage/innobase/include/os0sync.ic storage/innobase/include/page0zip.h storage/innobase/include/srv0mon.h storage/innobase/include/srv0mon.ic storage/innobase/include/srv0srv.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0sys.h storage/innobase/include/univ.i storage/innobase/lock/lock0lock.c storage/innobase/lock/lock0wait.c storage/innobase/log/log0log.c storage/innobase/log/log0recv.c storage/innobase/os/os0sync.c storage/innobase/page/page0cur.c storage/innobase/page/page0page.c storage/innobase/page/page0zip.c storage/innobase/row/row0ins.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0purge.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0mon.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0roll.c storage/innobase/trx/trx0trx.c storage/innobase/ut/ut0mem.c storage/myisam/mi_create.c strings/ctype.c support-files/mysql.spec.sh tests/mysql_client_test.c unittest/README.txt unittest/gunit/CMakeLists.txt unittest/mysys/CMakeLists.txt unittest/gunit/my_bitmap-t.cc Diff too large for email (17741 lines, the limit is 10000). No bundle (reason: revision is a merge).