List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:October 7 2010 2:40pm
Subject:bzr push into mysql-trunk-merge branch (Georgi.Kodinov:3239 to 3240)
View as plain text  
 3240 Georgi Kodinov	2010-10-07 [merge]
      null-merge

 3239 Jon Olav Hauglid	2010-10-07 [merge]
      Merge from mysql-5.5-bugteam to mysql-trunk-merge
      conflicts:
        Text conflict in mysql-test/collections/default.experimental
        Text conflict in sql/share/errmsg-utf8.txt
        Text conflict in sql/sql_lex.h
        Text conflict in sql/sql_partition_admin.cc

    added:
      mysql-test/suite/innodb/r/innodb-truncate.result
      mysql-test/suite/innodb/t/innodb-truncate.test
    modified:
      mysql-test/collections/default.experimental
      mysql-test/r/cache_innodb.result
      mysql-test/r/delete.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/merge.result
      mysql-test/r/sp_trans.result
      mysql-test/r/trigger-trans.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/parts/inc/partition_check.inc
      mysql-test/suite/perfschema/r/merge_table_io.result
      mysql-test/suite/sys_vars/r/foreign_key_checks_func.result
      mysql-test/suite/sys_vars/t/foreign_key_checks_func.test
      mysql-test/t/cache_innodb.test
      mysql-test/t/delete.test
      mysql-test/t/mdl_sync.test
      mysql-test/t/merge.test
      mysql-test/t/sp_trans.test
      mysql-test/t/trigger-trans.test
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/share/errmsg-utf8.txt
      sql/sp_head.cc
      sql/sql_cache.cc
      sql/sql_delete.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_partition_admin.cc
      sql/sql_partition_admin.h
      sql/sql_show.cc
      sql/sql_string.h
      sql/sql_truncate.cc
      sql/sql_truncate.h
      sql/sql_yacc.yy
      sql/table.h
      storage/archive/ha_archive.cc
      storage/archive/ha_archive.h
      storage/blackhole/ha_blackhole.cc
      storage/blackhole/ha_blackhole.h
      storage/example/ha_example.cc
      storage/example/ha_example.h
      storage/federated/ha_federated.cc
      storage/federated/ha_federated.h
      storage/heap/ha_heap.cc
      storage/heap/ha_heap.h
      storage/ibmdb2i/db2i_constraints.cc
      storage/ibmdb2i/ha_ibmdb2i.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/row/row0mysql.c
      storage/myisam/ha_myisam.cc
      storage/myisam/ha_myisam.h
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/ha_myisammrg.h
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/ha_perfschema.h

Attachment: [text/bzr-bundle] bzr/georgi.kodinov@oracle.com-20101007143827-74zsclq65ikgs0fa.bundle
Thread
bzr push into mysql-trunk-merge branch (Georgi.Kodinov:3239 to 3240) Georgi Kodinov7 Oct