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

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

    modified:
      mysql-test/t/ctype_utf8.test
      mysql-test/t/func_misc.test
      mysql-test/t/partition_innodb.test
 3442 Georgi Kodinov	2010-12-17 [merge]
      merge

    added:
      mysql-test/r/order_by_sortkey.result
      mysql-test/t/order_by_sortkey.test
      sql/bounded_queue.h
      sql/filesort_utils.cc
      sql/filesort_utils.h
      unittest/gunit/bounded_queue-t.cc
    modified:
      libmysqld/CMakeLists.txt
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
      mysql-test/include/order_by.inc
      mysql-test/include/select.inc
      mysql-test/r/explain.result
      mysql-test/r/group_by.result
      mysql-test/r/myisam_mrr.result
      mysql-test/r/myisam_mrr_cost.result
      mysql-test/r/myisam_mrr_cost_icp.result
      mysql-test/r/myisam_mrr_icp.result
      mysql-test/r/myisam_mrr_none.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/order_by_none.result
      mysql-test/r/select_icp_mrr.result
      mysql-test/r/select_none.result
      mysql-test/r/subselect_innodb.result
      mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
      mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
      mysql-test/t/group_by.test
      mysql-test/t/subselect_innodb.test
      mysys/CMakeLists.txt
      mysys/queues.c
      sql/CMakeLists.txt
      sql/filesort.cc
      sql/filesort.h
      sql/item_subselect.cc
      sql/rpl_master.cc
      sql/sql_const.h
      sql/sql_delete.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_sort.h
      sql/sql_table.cc
      sql/sql_update.cc
      sql/uniques.cc
      unittest/gunit/CMakeLists.txt
 3441 Luis Soares	2010-12-17 [merge]
      BUG#46166
      
      Manual merge from mysql-5.5-bugteam.

    modified:
      mysql-test/suite/binlog/r/binlog_index.result
      mysql-test/suite/binlog/t/binlog_index.test
      mysql-test/suite/rpl/r/rpl_binlog_errors.result
      mysql-test/suite/rpl/t/rpl_binlog_errors.test
      sql/binlog.cc
 3440 Luis Soares	2010-12-16 [merge]
      empty merge from mysql-5.5-bugteam.

 3439 Luis Soares	2010-12-16 [merge]
      BUG#46166
      
      Merging to latest mysql-trunk-bugfixing.

    added:
      mysql-test/include/io_thd_fault_injection.inc
      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/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
      sql/binlog.cc
      sql/binlog.h
      sql/handler.cc
      sql/log.cc
      sql/log.h
      sql/mysqld.cc
      sql/rpl_injector.cc
      sql/rpl_master.cc
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_reload.cc
      sql/sql_reload.h
 3438 Alexander Nozdrin	2010-12-16 [merge]
      Merge from mysql-5.5-bugteam.

    removed:
      mysql-test/suite/innodb/r/innodb_bug56947.result
      mysql-test/suite/innodb/t/innodb_bug56947.test
    added:
      mysql-test/suite/innodb/r/innodb_bug56947.result
      mysql-test/suite/innodb/t/innodb_bug56947.test
 3437 Alexander Nozdrin	2010-12-16 [merge]
      Manual merge from mysql-trunk.

    added:
      mysql-test/suite/innodb/r/innodb_bug56947.result
      mysql-test/suite/innodb/t/innodb_bug56947.test
    modified:
      .bzrignore
      README
      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_utf8.result
      mysql-test/r/date_formats.result
      mysql-test/r/fulltext.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_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
      support-files/mysql.spec.sh

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