From: Marc Alff Date: April 26 2011 8:35pm Subject: bzr commit into mysql-trunk branch (marc.alff:3326) List-Archive: http://lists.mysql.com/commits/136130 Message-Id: <201104262035.p3QKZtMB019131@acsmt357.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-bug12346211/ based on revid:marc.alff@stripped 3326 Marc Alff 2011-04-26 [merge] Local merge added: 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 storage/innobase/include/srv0conc.h storage/innobase/srv/srv0conc.c modified: .bzrignore client/mysqltest.cc cmake/maintainer.cmake include/m_ctype.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v2.h.pp mysql-test/collections/default.experimental mysql-test/include/join_cache.inc mysql-test/lib/My/Find.pm mysql-test/lib/mtr_gcov.pl mysql-test/mysql-test-run.pl mysql-test/r/func_math.result mysql-test/r/grant.result mysql-test/r/having.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/type_timestamp.result mysql-test/suite/binlog/r/binlog_bug23533.result mysql-test/suite/binlog/t/binlog_bug23533.test mysql-test/suite/innodb/r/innodb_monitor.result 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/misc.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/misc.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/t/func_math.test mysql-test/t/grant.test mysql-test/t/having.test mysql-test/t/loaddata.test mysql-test/t/type_timestamp.test mysys/default.c sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/item_cmpfunc.cc sql/item_func.cc sql/mysqld.h sql/opt_range.cc sql/sp.cc sql/sp.h sql/sql_base.h sql/sql_class.cc sql/sql_join_cache.cc sql/sql_load.cc sql/sql_select.cc sql/sql_select.h sql/structs.h sql/table.cc storage/heap/ha_heap.cc storage/heap/ha_heap.h 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/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.ic storage/innobase/include/dict0mem.ic storage/innobase/include/dict0priv.ic storage/innobase/include/fsp0fsp.h storage/innobase/include/log0log.h storage/innobase/include/log0log.ic storage/innobase/include/os0file.h storage/innobase/include/os0sync.h storage/innobase/include/os0thread.h 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/trx0sys.h 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/row0row.c storage/innobase/row/row0sel.c storage/innobase/row/row0uins.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/trx0roll.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c storage/innobase/trx/trx0undo.c storage/innobase/ut/ut0dbg.c storage/innobase/ut/ut0ut.c storage/myisam/ha_myisam.cc storage/myisam/ha_myisam.h storage/myisammrg/ha_myisammrg.cc storage/myisammrg/ha_myisammrg.h Diff too large for email (15452 lines, the limit is 10000). No bundle (reason: revision is a merge).