From: Bjorn Munch Date: February 4 2011 12:23pm Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3022) List-Archive: http://lists.mysql.com/commits/130403 Message-Id: <201102041223.p14CNr4k021879@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped 3022 Bjorn Munch 2011-02-04 [merge] merge from trunk removed: mysql-test/suite/perfschema/r/debug_env.result mysql-test/suite/perfschema/t/debug_env.test added: mysql-test/extra/rpl_tests/rpl_insert_duplicate.test mysql-test/suite/innodb/r/innodb_bug30423.result mysql-test/suite/innodb/t/innodb_bug30423.test mysql-test/suite/rpl/r/rpl_insert_duplicate.result mysql-test/suite/rpl/t/rpl_insert_duplicate.test unittest/gunit/item-t.cc modified: .bzrignore BUILD/SETUP.sh BUILD/build_mccge.sh config.h.cmake configure.cmake include/my_global.h include/my_sys.h include/my_time.h mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_insert_ignore.test mysql-test/include/commit.inc mysql-test/include/gis_keys.inc mysql-test/include/icp_tests.inc mysql-test/include/mtr_warnings.sql mysql-test/include/order_by.inc mysql-test/include/plugin.defs mysql-test/include/range.inc mysql-test/include/subquery.inc mysql-test/include/subquery_sj.inc mysql-test/include/subquery_sj_innodb.inc mysql-test/r/commit_1innodb.result mysql-test/r/csv_not_null.result mysql-test/r/delete.result mysql-test/r/filesort_debug.result mysql-test/r/func_in_all.result mysql-test/r/func_time.result mysql-test/r/gis.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_icp_none.result mysql-test/r/join_outer.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.result mysql-test/r/not_embedded_server.result mysql-test/r/optimizer_switch.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/range_all.result mysql-test/r/range_icp.result mysql-test/r/range_icp_mrr.result mysql-test/r/range_mrr.result mysql-test/r/range_mrr_cost.result mysql-test/r/range_none.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_jcl6.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_all.result mysql-test/r/subquery_sj_innodb_all_jcl6.result mysql-test/r/subquery_sj_innodb_all_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/symlink.result mysql-test/suite/innodb/r/innodb_gis.result mysql-test/suite/innodb/t/innodb_bug56143.test mysql-test/suite/rpl/r/rpl_insert_ignore.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_insert_ignore.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/t/csv_not_null.test mysql-test/t/delete.test mysql-test/t/filesort_debug.test mysql-test/t/func_time.test mysql-test/t/join_outer.test mysql-test/t/not_embedded_server.test mysql-test/t/optimizer_switch.test mysql-test/t/plugin_auth.test mysql-test/t/symlink.test mysql-test/t/variables.test plugin/auth/test_plugin.c regex/my_regex.h regex/regcomp.c regex/reginit.c scripts/mysql_config.pl.in scripts/mysql_config.sh sql-common/client.c sql-common/my_time.c sql/field.cc sql/filesort.cc sql/gcalc_slicescan.cc sql/gcalc_slicescan.h sql/item.cc sql/item.h sql/item_subselect.h sql/mysqld.cc sql/mysqld.h sql/protocol.cc sql/rpl_injector.cc sql/rpl_injector.h sql/rpl_master.cc sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sql_class.cc sql/sql_class.h sql/sql_delete.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_plugin.cc sql/sql_select.cc sql/sql_table.cc sql/sql_yacc.yy sql/sys_vars.cc sql/unireg.h storage/innobase/CMakeLists.txt storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0sea.c storage/innobase/buf/buf0buddy.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0lru.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/dict/dict0stats.c storage/innobase/handler/ha_innodb.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0cur.h storage/innobase/include/buf0buf.h storage/innobase/include/buf0lru.h storage/innobase/include/dict0mem.h storage/innobase/include/dict0types.h storage/innobase/include/lock0lock.h storage/innobase/include/lock0priv.h storage/innobase/include/os0sync.h storage/innobase/include/os0sync.ic storage/innobase/include/os0thread.h storage/innobase/include/rem0cmp.h storage/innobase/include/rem0cmp.ic storage/innobase/include/row0vers.h storage/innobase/include/srv0srv.h storage/innobase/include/sync0rw.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0roll.h storage/innobase/include/trx0rseg.h storage/innobase/include/trx0sys.h storage/innobase/include/trx0sys.ic storage/innobase/include/trx0trx.h storage/innobase/include/trx0trx.ic storage/innobase/include/trx0types.h storage/innobase/include/univ.i storage/innobase/lock/lock0lock.c storage/innobase/lock/lock0wait.c storage/innobase/mem/mem0mem.c storage/innobase/mtr/mtr0log.c storage/innobase/page/page0zip.c storage/innobase/read/read0read.c storage/innobase/rem/rem0cmp.c storage/innobase/row/row0ins.c storage/innobase/row/row0merge.c storage/innobase/row/row0sel.c storage/innobase/row/row0umod.c storage/innobase/row/row0upd.c storage/innobase/row/row0vers.c storage/innobase/scripts/persistent_storage.sql storage/innobase/srv/srv0srv.c storage/innobase/sync/sync0arr.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0i_s.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0roll.c storage/innobase/trx/trx0rseg.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c unittest/gunit/CMakeLists.txt Diff too large for email (14454 lines, the limit is 10000). No bundle (reason: revision is a merge).