From: Bjorn Munch Date: March 31 2011 10:36am Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3054) List-Archive: http://lists.mysql.com/commits/134347 Message-Id: <201103311036.p2VAaqIO011473@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped 3054 Bjorn Munch 2011-03-31 [merge] merge from trunk 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/r/tablespace.result mysql-test/std_data/cluster_7022_table.MYD mysql-test/std_data/cluster_7022_table.MYI mysql-test/std_data/cluster_7022_table.frm mysql-test/t/tablespace.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 client/mysqlbinlog.cc extra/perror.c extra/yassl/include/cert_wrapper.hpp extra/yassl/include/openssl/prefix_ssl.h extra/yassl/include/openssl/ssl.h extra/yassl/include/yassl_int.hpp extra/yassl/src/cert_wrapper.cpp extra/yassl/src/ssl.cpp extra/yassl/src/yassl_int.cpp extra/yassl/taocrypt/include/asn.hpp extra/yassl/taocrypt/src/asn.cpp include/heap.h include/my_global.h include/my_net.h include/myisam.h include/mysql_com.h mysql-test/extra/rpl_tests/rpl_deadlock.test mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test mysql-test/extra/rpl_tests/rpl_record_compare.test mysql-test/extra/rpl_tests/rpl_stop_middle_group.test mysql-test/include/subquery_sj.inc mysql-test/r/cast.result mysql-test/r/events_bugs.result mysql-test/r/func_math.result mysql-test/r/func_time.result mysql-test/r/innodb_icp_all.result mysql-test/r/join_cache_jcl5.result mysql-test/r/join_cache_jcl6.result mysql-test/r/join_cache_jcl7.result mysql-test/r/join_cache_jcl8.result mysql-test/r/myisam_icp_all.result mysql-test/r/mysqlbinlog.result mysql-test/r/packet.result mysql-test/r/partition_error.result mysql-test/r/partition_symlink.result mysql-test/r/shm.result mysql-test/r/ssl.result mysql-test/r/subquery_mat_all.result mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_all_jcl6.result mysql-test/r/subquery_sj_all_jcl7.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_dupsweed_jcl6.result mysql-test/r/subquery_sj_dupsweed_jcl7.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_firstmatch_jcl6.result mysql-test/r/subquery_sj_firstmatch_jcl7.result mysql-test/r/subquery_sj_innodb_all.result mysql-test/r/subquery_sj_innodb_all_jcl6.result mysql-test/r/subquery_sj_innodb_all_jcl7.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_jcl6.result mysql-test/r/subquery_sj_loosescan_jcl7.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_jcl6.result mysql-test/r/subquery_sj_mat_jcl7.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none.result mysql-test/r/subquery_sj_none_jcl6.result mysql-test/r/subquery_sj_none_jcl7.result mysql-test/r/variables-notembedded.result mysql-test/r/variables.result mysql-test/r/xa.result mysql-test/suite/innodb/include/innodb_stats.inc mysql-test/suite/innodb/r/innodb_stats.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_deadlock_innodb.result mysql-test/suite/rpl/r/rpl_init_slave_errors.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/r/rpl_stm_stop_middle_group.result mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test mysql-test/suite/rpl/t/rpl_init_slave_errors.test 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_show_slave_running.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/events_bugs.test mysql-test/t/func_math.test mysql-test/t/func_time.test mysql-test/t/mysqlbinlog.test mysql-test/t/partition_error.test mysql-test/t/partition_symlink.test mysql-test/t/ssl.test mysql-test/t/variables-notembedded.test mysql-test/t/variables.test mysql-test/t/xa.test mysys/CMakeLists.txt mysys/my_handler_errors.h sql/handler.h sql/item.cc sql/item_func.cc sql/item_timefunc.cc sql/item_timefunc.h sql/log_event.cc sql/mysqld.cc sql/rpl_reporting.cc sql/rpl_reporting.h sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sql_base.cc sql/sql_select.cc sql/sql_show.cc sql/sql_table.cc sql/sys_vars.cc sql/table.cc sql/table.h sql/transaction.cc sql/unireg.cc storage/innobase/CMakeLists.txt storage/innobase/btr/btr0cur.c storage/innobase/buf/buf0buddy.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/buf/buf0rea.c storage/innobase/data/data0data.c storage/innobase/dict/dict0boot.c storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/dict/dict0mem.c storage/innobase/dict/dict0stats.c storage/innobase/fil/fil0fil.c storage/innobase/fsp/fsp0fsp.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0pcur.h storage/innobase/include/btr0pcur.ic storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0flu.ic storage/innobase/include/buf0rea.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0mem.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/page0types.h storage/innobase/include/page0zip.ic storage/innobase/include/rem0rec.h storage/innobase/include/rem0rec.ic storage/innobase/include/srv0srv.h storage/innobase/include/sync0sync.h storage/innobase/include/univ.i storage/innobase/lock/lock0lock.c storage/innobase/mtr/mtr0log.c storage/innobase/mtr/mtr0mtr.c storage/innobase/page/page0page.c storage/innobase/page/page0zip.c storage/innobase/pars/pars0pars.c storage/innobase/row/row0ext.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0row.c storage/innobase/row/row0sel.c storage/innobase/row/row0umod.c storage/innobase/row/row0undo.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/trx/trx0i_s.c storage/innobase/trx/trx0rec.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c storage/myisam/ft_stopwords.c storage/myisam/mi_check.c storage/myisam/mi_range.c mysql-test/r/partition_myisam.result mysql-test/t/partition_myisam.test Diff too large for email (15982 lines, the limit is 10000). No bundle (reason: revision is a merge).