List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:December 17 2010 9:14am
Subject:bzr commit into mysql-5.1-mtr branch (bjorn.munch:2960)
View as plain text  
#At file:///home/bm136801/my/upd-51/ based on revid:bjorn.munch@stripped

 2960 Bjorn Munch	2010-12-17 [merge]
      merge from 5.1 main up to 3474

    added:
      mysql-test/r/partition_binlog_stmt.result
      mysql-test/suite/innodb/r/innodb_bug56716.result
      mysql-test/suite/innodb/r/innodb_bug57255.result
      mysql-test/suite/innodb/t/innodb_bug56716.test
      mysql-test/suite/innodb/t/innodb_bug57255.test
      mysql-test/suite/innodb_plugin/r/innodb_bug53756.result
      mysql-test/suite/innodb_plugin/r/innodb_bug56716.result
      mysql-test/suite/innodb_plugin/r/innodb_bug57255.result
      mysql-test/suite/innodb_plugin/t/innodb_bug53756-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_bug53756.test
      mysql-test/suite/innodb_plugin/t/innodb_bug56716.test
      mysql-test/suite/innodb_plugin/t/innodb_bug57255.test
      mysql-test/t/partition_binlog_stmt.test
    modified:
      BUILD/build_mccge.sh
      BUILD/check-cpu
      config/ac-macros/maintainer.m4
      configure.in
      dbug/dbug.c
      include/mysql.h
      include/mysql.h.pp
      include/sha1.h
      libmysql/libmysql.c
      mysql-test/collections/default.daily
      mysql-test/include/index_merge_ror_cpk.inc
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/index_merge_innodb.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/merge.result
      mysql-test/r/multi_update.result
      mysql-test/r/order_by.result
      mysql-test/r/partition.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_hash.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/partition_range.result
      mysql-test/r/ps.result
      mysql-test/r/ps_2myisam.result
      mysql-test/r/ps_3innodb.result
      mysql-test/r/ps_4heap.result
      mysql-test/r/ps_5merge.result
      mysql-test/r/row.result
      mysql-test/r/subselect.result
      mysql-test/r/subselect4.result
      mysql-test/r/trigger_notembedded.result
      mysql-test/r/type_timestamp.result
      mysql-test/r/variables_debug.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/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/innodb_plugin/r/innodb_mysql.result
      mysql-test/suite/innodb_plugin/t/innodb_mysql.test
      mysql-test/suite/ndb/r/ps_7ndb.result
      mysql-test/suite/parts/r/partition_alter3_innodb.result
      mysql-test/suite/parts/r/partition_alter3_myisam.result
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
      mysql-test/t/merge.test
      mysql-test/t/multi_update.test
      mysql-test/t/order_by.test
      mysql-test/t/partition.test
      mysql-test/t/partition_error.test
      mysql-test/t/partition_pruning.test
      mysql-test/t/ps.test
      mysql-test/t/row.test
      mysql-test/t/subselect4.test
      mysql-test/t/trigger_notembedded.test
      mysql-test/t/type_timestamp.test
      mysql-test/t/variables_debug.test
      mysys/my_getopt.c
      mysys/sha1.c
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_subselect.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log.cc
      sql/net_serv.cc
      sql/opt_range.cc
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_load.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_table.cc
      sql/sql_trigger.cc
      sql/table.cc
      sql/table.h
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0pcur.c
      storage/innobase/btr/btr0sea.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/eval/eval0eval.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/ut0rnd.ic
      storage/innobase/lock/lock0lock.c
      storage/innobase/log/log0recv.c
      storage/innobase/os/os0file.c
      storage/innobase/que/que0que.c
      storage/innobase/row/row0mysql.c
      storage/innobase/row/row0purge.c
      storage/innobase/row/row0sel.c
      storage/innobase/row/row0umod.c
      storage/innobase/row/row0upd.c
      storage/innobase/row/row0vers.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/innodb_plugin/ChangeLog
      storage/innodb_plugin/btr/btr0btr.c
      storage/innodb_plugin/btr/btr0cur.c
      storage/innodb_plugin/btr/btr0pcur.c
      storage/innodb_plugin/btr/btr0sea.c
      storage/innodb_plugin/buf/buf0flu.c
      storage/innodb_plugin/dict/dict0crea.c
      storage/innodb_plugin/dict/dict0dict.c
      storage/innodb_plugin/dict/dict0load.c
      storage/innodb_plugin/eval/eval0eval.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/handler/i_s.cc
      storage/innodb_plugin/include/os0sync.h
      storage/innodb_plugin/include/univ.i
      storage/innodb_plugin/include/ut0rnd.ic
      storage/innodb_plugin/log/log0recv.c
      storage/innodb_plugin/os/os0file.c
      storage/innodb_plugin/que/que0que.c
      storage/innodb_plugin/row/row0mysql.c
      storage/innodb_plugin/row/row0purge.c
      storage/innodb_plugin/row/row0sel.c
      storage/innodb_plugin/row/row0umod.c
      storage/innodb_plugin/row/row0vers.c
      storage/innodb_plugin/trx/trx0purge.c
      storage/innodb_plugin/trx/trx0roll.c
      storage/innodb_plugin/trx/trx0sys.c
      storage/innodb_plugin/trx/trx0trx.c
      storage/innodb_plugin/trx/trx0undo.c
      storage/myisam/mi_range.c
      storage/myisam/mi_search.c
      storage/myisam/rt_index.c
      storage/myisam/rt_split.c
      tests/mysql_client_test.c

Diff too large for email (10376 lines, the limit is 10000).
No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-5.1-mtr branch (bjorn.munch:2960) Bjorn Munch17 Dec