List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:February 21 2011 1:05pm
Subject:bzr commit into mysql-trunk-mtr branch (bjorn.munch:3028)
View as plain text  
#At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped

 3028 Bjorn Munch	2011-02-21 [merge]
      new merge from trunk

    added:
      mysql-test/include/execute_with_statistics.inc
      mysql-test/r/partition_explicit_prune.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/parts/inc/partition-dml-1-1-modes.inc
      mysql-test/suite/parts/inc/partition-dml-1-1.inc
      mysql-test/suite/parts/inc/partition-dml-1-10.inc
      mysql-test/suite/parts/inc/partition-dml-1-11.inc
      mysql-test/suite/parts/inc/partition-dml-1-2.inc
      mysql-test/suite/parts/inc/partition-dml-1-3.inc
      mysql-test/suite/parts/inc/partition-dml-1-4.inc
      mysql-test/suite/parts/inc/partition-dml-1-5.inc
      mysql-test/suite/parts/inc/partition-dml-1-6.inc
      mysql-test/suite/parts/inc/partition-dml-1-7.inc
      mysql-test/suite/parts/inc/partition-dml-1-8.inc
      mysql-test/suite/parts/inc/partition-dml-1-9.inc
      mysql-test/suite/parts/inc/partition-dml_cr_tab.inc
      mysql-test/suite/parts/inc/partition-dml_ins_tab.inc
      mysql-test/suite/parts/inc/rpl-partition-dml-1-1.inc
      mysql-test/suite/parts/r/partition-dml-1-1-innodb-modes.result
      mysql-test/suite/parts/r/partition-dml-1-1-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-1-myisam-modes.result
      mysql-test/suite/parts/r/partition-dml-1-1-myisam.result
      mysql-test/suite/parts/r/partition-dml-1-10-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-10-myisam.result
      mysql-test/suite/parts/r/partition-dml-1-11-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-11-myisam.result
      mysql-test/suite/parts/r/partition-dml-1-2-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-2-myisam.result
      mysql-test/suite/parts/r/partition-dml-1-3-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-4-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-5-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-6-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-7-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-8-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-9-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-9-myisam.result
      mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result
      mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result
      mysql-test/suite/parts/t/partition-dml-1-1-innodb-modes.test
      mysql-test/suite/parts/t/partition-dml-1-1-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-1-myisam-modes.test
      mysql-test/suite/parts/t/partition-dml-1-1-myisam.test
      mysql-test/suite/parts/t/partition-dml-1-10-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-10-myisam.test
      mysql-test/suite/parts/t/partition-dml-1-11-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-11-myisam.test
      mysql-test/suite/parts/t/partition-dml-1-2-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-2-myisam.test
      mysql-test/suite/parts/t/partition-dml-1-3-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-4-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-5-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-6-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-7-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-8-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-9-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-9-myisam.test
      mysql-test/suite/parts/t/rpl-partition-dml-1-1-innodb.test
      mysql-test/suite/parts/t/rpl-partition-dml-1-1-myisam.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/partition_explicit_prune.test
    renamed:
      unittest/mysys/bitmap-t.c => unittest/gunit/my_bitmap-t.cc
    modified:
      .bzrignore
      client/mysqldump.c
      include/my_base.h
      include/my_bitmap.h
      include/my_global.h
      include/mysql_embed.h
      include/welcome_copyright_notice.h
      mysql-test/collections/default.experimental
      mysql-test/include/subquery_mat.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/include/unsafe_binlog.inc
      mysql-test/r/alter_table.result
      mysql-test/r/create.result
      mysql-test/r/ctype_cp1250_ch.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_eucjpms.result
      mysql-test/r/func_rollback.result
      mysql-test/r/func_time.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/mdl_sync.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/mysqldump.result
      mysql-test/r/negation_elimination.result
      mysql-test/r/partition_exchange.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/unsafe_binlog_innodb.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_information_schema.test
      mysql-test/suite/innodb/t/innodb_monitor.test
      mysql-test/suite/parts/inc/partition_fail.inc
      mysql-test/suite/parts/r/partition_exch_qa_13.result
      mysql-test/suite/parts/r/partition_exch_qa_2.result
      mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
      mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
      mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
      mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
      mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
      mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
      mysql-test/suite/parts/r/partition_repair_myisam.result
      mysql-test/suite/parts/t/partition_debug_myisam.test
      mysql-test/suite/parts/t/partition_exch_qa_14.test
      mysql-test/suite/parts/t/partition_repair_myisam.test
      mysql-test/suite/perfschema/include/table_aggregate_load.inc
      mysql-test/suite/perfschema/include/table_aggregate_setup.inc
      mysql-test/suite/sys_vars/r/all_vars.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/alter_table.test
      mysql-test/t/create.test
      mysql-test/t/ctype_cp1250_ch.test
      mysql-test/t/ctype_cp1251.test
      mysql-test/t/ctype_eucjpms.test
      mysql-test/t/func_rollback.test
      mysql-test/t/func_time.test
      mysql-test/t/greedy_optimizer.test
      mysql-test/t/group_by.test
      mysql-test/t/mdl_sync.test
      mysql-test/t/mysqldump.test
      mysql-test/t/negation_elimination.test
      mysql-test/t/partition_binlog.test
      mysql-test/valgrind.supp
      mysys/hash.c
      mysys/my_handler.c
      mysys/my_handler_errors.h
      sql/ha_ndbcluster_cond.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_func.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_range.cc
      sql/partition_info.cc
      sql/partition_info.h
      sql/set_var.cc
      sql/share/errmsg-utf8.txt
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_connect.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_select.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/table.cc
      sql/table.h
      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
      tests/mysql_client_test.c
      unittest/README.txt
      unittest/gunit/CMakeLists.txt
      unittest/gunit/item-t.cc
      unittest/mysys/CMakeLists.txt
      unittest/gunit/my_bitmap-t.cc

Diff too large for email (29355 lines, the limit is 10000).
No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-trunk-mtr branch (bjorn.munch:3028) Bjorn Munch21 Feb