List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:May 12 2011 8:45am
Subject:bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3336)
View as plain text  
#At file:///data0/magnus/mysql/merge-5.5.12_5.5-cluster/ based on revid:magnus.blaudd@stripped5ehejuzy0bo8yd

 3336 Magnus Blåudd	2011-05-12 [merge]
      Merge 5.5.12 -> 5.5-cluster

    removed:
      include/my_handler.h
      mysys/my_gethostbyname.c
      mysys/my_handler.c
      mysys/my_port.c
      storage/innobase/include/thr0loc.h
      storage/innobase/include/thr0loc.ic
      storage/innobase/thr/
      storage/innobase/thr/thr0loc.c
    added:
      include/my_compare.h
      mysql-test/include/not_crashrep.inc
      mysql-test/suite/innodb/r/innodb_bug60196.result
      mysql-test/suite/innodb/t/innodb_bug60196-master.opt
      mysql-test/suite/innodb/t/innodb_bug60196.test
      mysys/my_compare.c
    renamed:
      mysql-test/r/partition_not_embedded.result => mysql-test/r/partition_myisam.result
      mysql-test/t/partition_not_embedded.test => mysql-test/t/partition_myisam.test
    modified:
      .bzrignore
      VERSION
      client/client_priv.h
      client/mysqlbinlog.cc
      client/mysqlslap.c
      client/mysqltest.cc
      extra/perror.c
      include/heap.h
      include/my_global.h
      include/my_net.h
      include/myisam.h
      include/violite.h
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
      mysql-test/extra/rpl_tests/rpl_record_compare.test
      mysql-test/include/ctype_numconv.inc
      mysql-test/include/mix1.inc
      mysql-test/include/mtr_warnings.sql
      mysql-test/lib/mtr_misc.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/archive.result
      mysql-test/r/bootstrap.result
      mysql-test/r/cast.result
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/events_bugs.result
      mysql-test/r/explain.result
      mysql-test/r/func_gconcat.result
      mysql-test/r/func_group.result
      mysql-test/r/func_math.result
      mysql-test/r/func_time.result
      mysql-test/r/gis.result
      mysql-test/r/lowercase_table2.result
      mysql-test/r/mysqlbinlog.result
      mysql-test/r/mysqldump.result
      mysql-test/r/mysqlslap.result
      mysql-test/r/order_by.result
      mysql-test/r/packet.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_symlink.result
      mysql-test/r/ps.result
      mysql-test/r/shm.result
      mysql-test/r/show_check.result
      mysql-test/r/sp-destruct.result
      mysql-test/r/sp.result
      mysql-test/r/subselect3.result
      mysql-test/r/variables-notembedded.result
      mysql-test/r/variables.result
      mysql-test/r/view.result
      mysql-test/suite/binlog/t/binlog_index.test
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/innodb/t/innodb_bug53756.test
      mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result
      mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
      mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt
      mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt
      mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
      mysql-test/suite/rpl/t/rpl_semi_sync_event.test
      mysql-test/suite/rpl/t/rpl_sync.test
      mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
      mysql-test/suite/sys_vars/r/max_allowed_packet_func.result
      mysql-test/t/archive.test
      mysql-test/t/bootstrap.test
      mysql-test/t/cast.test
      mysql-test/t/crash_commit_before.test
      mysql-test/t/events_bugs.test
      mysql-test/t/explain.test
      mysql-test/t/func_group.test
      mysql-test/t/func_math.test
      mysql-test/t/func_time.test
      mysql-test/t/gis.test
      mysql-test/t/lowercase_table2.test
      mysql-test/t/myisam_crash_before_flush_keys.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/t/mysqldump.test
      mysql-test/t/mysqlslap.test
      mysql-test/t/order_by.test
      mysql-test/t/partition_error.test
      mysql-test/t/partition_symlink.test
      mysql-test/t/ps.test
      mysql-test/t/show_check.test
      mysql-test/t/sp-destruct.test
      mysql-test/t/sp.test
      mysql-test/t/variables-notembedded.test
      mysql-test/t/variables.test
      mysql-test/t/view.test
      mysys/CMakeLists.txt
      mysys/my_handler_errors.h
      plugin/auth/auth_socket.c
      plugin/fulltext/plugin_example.c
      scripts/make_win_bin_dist
      sql/event_db_repository.cc
      sql/handler.h
      sql/hostname.cc
      sql/item.cc
      sql/item.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log_event.cc
      sql/mysqld.cc
      sql/share/errmsg-utf8.txt
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_cursor.cc
      sql/sql_parse.cc
      sql/sql_show.cc
      sql/sys_vars.cc
      sql/table.cc
      sql/table.h
      storage/archive/ha_archive.cc
      storage/innobase/CMakeLists.txt
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0sea.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/buf/buf0rea.c
      storage/innobase/dict/dict0load.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/i_s.h
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0pcur.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0rea.h
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/ibuf0ibuf.h
      storage/innobase/include/ibuf0ibuf.ic
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/mtr0mtr.ic
      storage/innobase/include/page0page.h
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0arr.h
      storage/innobase/include/sync0sync.h
      storage/innobase/mem/mem0dbg.c
      storage/innobase/mtr/mtr0mtr.c
      storage/innobase/page/page0page.c
      storage/innobase/page/page0zip.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/trx0i_s.c
      storage/innobase/trx/trx0trx.c
      storage/innobase/ut/ut0dbg.c
      storage/myisam/ft_stopwords.c
      storage/myisam/mi_check.c
      tests/mysql_client_test.c
      vio/viosocket.c
      mysql-test/r/partition_myisam.result
      mysql-test/t/partition_myisam.test

Diff too large for email (11018 lines, the limit is 10000).
No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3336) Magnus Blåudd12 May