List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:December 17 2010 12:49pm
Subject:bzr push into mysql-5.5 branch (Georgi.Kodinov:3203 to 3210)
View as plain text  
 3210 Georgi Kodinov	2010-12-17 [merge]
      merge

    modified:
      .bzr-mysql/default.conf
 3209 Georgi Kodinov	2010-12-17 [merge]
      merge

 3208 Georgi Kodinov	2010-12-17 [merge]
      merge

 3207 Georgi Kodinov	2010-12-17 [merge]
      merge

    added:
      mysql-test/include/io_thd_fault_injection.inc
      mysql-test/suite/innodb/r/innodb_bug56947.result
      mysql-test/suite/innodb/t/innodb_bug56947.test
      mysql-test/suite/rpl/r/rpl_binlog_errors.result
      mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt
      mysql-test/suite/rpl/t/rpl_binlog_errors.test
    modified:
      mysql-test/include/restart_mysqld.inc
      mysql-test/r/join_outer_innodb.result
      mysql-test/suite/binlog/r/binlog_index.result
      mysql-test/suite/binlog/r/binlog_max_extension.result
      mysql-test/suite/binlog/t/binlog_index.test
      mysql-test/suite/binlog/t/binlog_max_extension.test
      mysql-test/t/join_outer_innodb.test
      sql/handler.cc
      sql/log.cc
      sql/log.h
      sql/mysqld.cc
      sql/rpl_injector.cc
      sql/slave.cc
      sql/slave.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_reload.cc
      sql/sql_reload.h
      sql/sql_repl.cc
      sql/sql_select.cc
 3206 Georgi Kodinov	2010-12-17 [merge]
      merge

 3205 Georgi Kodinov	2010-12-17
      post-merge test result update

    modified:
      mysql-test/r/fulltext.result
 3204 Georgi Kodinov	2010-12-16 [merge]
      merge

 3203 Georgi Kodinov	2010-12-16 [merge]
      merge mysql-5.5->mysql-5.5-bugteam

    modified:
      .bzrignore
      README
      VERSION
      cmake/install_layout.cmake
      mysql-test/collections/default.experimental
      mysql-test/mysql-test-run.pl
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ujis.result
      mysql-test/r/ctype_utf16.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/date_formats.result
      mysql-test/r/func_misc.result
      mysql-test/r/lock_sync.result
      mysql-test/r/mysqltest.result
      mysql-test/r/partition_innodb_plugin.result
      mysql-test/r/sp-destruct.result
      mysql-test/r/truncate_coverage.result
      mysql-test/r/type_date.result
      mysql-test/r/xml.result
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/t/ctype_latin1.test
      mysql-test/t/ctype_ujis.test
      mysql-test/t/ctype_utf8.test
      mysql-test/t/date_formats.test
      mysql-test/t/fulltext.test
      mysql-test/t/func_misc.test
      mysql-test/t/lock_sync.test
      mysql-test/t/mysqltest.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/partition_innodb_plugin.test
      mysql-test/t/sp-destruct.test
      mysql-test/t/truncate_coverage.test
      mysql-test/t/type_date.test
      mysql-test/t/xml.test
      packaging/WiX/CMakeLists.txt
      sql-common/my_time.c
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_strfunc.cc
      sql/item_timefunc.cc
      sql/item_xmlfunc.cc
      sql/key.cc
      sql/sp.cc
      sql/sp_head.cc
      sql/sql_parse.cc
      sql/sql_show.cc
      sql/sql_truncate.cc
      strings/ctype-ucs2.c
      strings/ctype-utf8.c
      support-files/mysql.spec.sh

Diff too large for email (16669 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (Georgi.Kodinov:3203 to 3210) Georgi Kodinov17 Dec