From: Bjorn Munch Date: June 29 2011 3:05pm Subject: bzr push into mysql-5.5-mtr branch (bjorn.munch:3221 to 3223) List-Archive: http://lists.mysql.com/commits/140032 Message-Id: <201106291505.p5TF5j2Q028540@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3223 Bjorn Munch 2011-06-29 [merge] null upmerge 3222 Bjorn Munch 2011-06-29 [merge] merge from 5.5 main added: mysql-test/r/archive_debug.result mysql-test/r/mysql_embedded.result mysql-test/suite/binlog/r/binlog_reset_master.result mysql-test/suite/binlog/t/binlog_reset_master.test mysql-test/suite/innodb/r/innodb_index_large_prefix.result mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result mysql-test/suite/innodb/t/innodb_index_large_prefix.test mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test mysql-test/t/archive_debug.test mysql-test/t/mysql_embedded.test modified: .bzrignore VERSION client/mysql.cc client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqlcheck.c client/mysqldump.c client/mysqlimport.c client/mysqlshow.c client/mysqlslap.c client/mysqltest.cc cmake/install_layout.cmake cmake/make_dist.cmake.in cmake/os/WindowsCache.cmake cmake/plugin.cmake configure.cmake extra/innochecksum.c extra/perror.c extra/yassl/src/yassl_error.cpp include/my_base.h include/mysql/plugin_audit.h include/mysql/plugin_audit.h.pp include/mysql/thread_pool_priv.h include/violite.h libmysql/authentication_win/plugin_client.cc libmysql/errmsg.c libmysqld/lib_sql.cc mysql-test/collections/default.experimental mysql-test/include/plugin.defs mysql-test/mysql-test-run.pl mysql-test/r/alter_table.result mysql-test/r/events_bugs.result mysql-test/r/flush.result mysql-test/r/func_math.result mysql-test/r/gis-rtree.result mysql-test/r/innodb_mysql_lock.result mysql-test/r/innodb_mysql_sync.result mysql-test/r/multi_update.result mysql-test/r/multi_update_innodb.result mysql-test/r/openssl_1.result mysql-test/r/partition.result mysql-test/r/partition_datatype.result mysql-test/r/query_cache_28249.result mysql-test/r/query_cache_debug.result mysql-test/r/sp_notembedded.result mysql-test/r/sp_sync.result mysql-test/r/symlink.result mysql-test/r/trigger-compat.result mysql-test/r/trigger.result mysql-test/r/type_datetime.result mysql-test/r/variables-big.result mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/r/innodb-use-sys-malloc.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt mysql-test/suite/innodb/t/innodb-use-sys-malloc.test mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/suite/perfschema/include/cleanup_helper.inc mysql-test/suite/perfschema/include/upgrade_check.inc mysql-test/suite/perfschema/r/selects.result mysql-test/suite/perfschema/t/selects.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/t/alter_table.test mysql-test/t/disabled.def mysql-test/t/events_bugs.test mysql-test/t/flush.test mysql-test/t/func_math.test mysql-test/t/gis-rtree.test mysql-test/t/innodb_mysql_lock.test mysql-test/t/innodb_mysql_sync.test mysql-test/t/multi_update.test mysql-test/t/multi_update_innodb.test mysql-test/t/partition.test mysql-test/t/partition_datatype.test mysql-test/t/query_cache_28249.test mysql-test/t/query_cache_debug.test mysql-test/t/sp_notembedded.test mysql-test/t/sp_sync.test mysql-test/t/symlink.test mysql-test/t/trigger-compat.test mysql-test/t/type_datetime.test mysql-test/t/variables-big.test mysys/mf_pack.c mysys/my_handler_errors.h plugin/audit_null/audit_null.c sql-common/client.c sql/event_db_repository.cc sql/event_db_repository.h sql/event_parse_data.cc sql/event_parse_data.h sql/events.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/item.h sql/item_func.cc sql/item_timefunc.cc sql/item_timefunc.h sql/log.cc sql/mdl.h sql/mysqld.cc sql/password.c sql/share/errmsg-utf8.txt sql/sp.cc sql/sp_head.cc sql/sql_acl.cc sql/sql_audit.cc sql/sql_class.cc sql/sql_class.h sql/sql_db.cc sql/sql_parse.cc sql/sql_select.cc sql/sql_show.cc sql/sql_table.cc sql/sql_trigger.cc sql/sql_trigger.h sql/sql_update.cc sql/sql_yacc.yy sql/table.h storage/archive/azio.c storage/archive/ha_archive.cc storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/buf/buf0buddy.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/buf/buf0lru.c storage/innobase/data/data0data.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/dict/dict0mem.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/include/btr0btr.h storage/innobase/include/btr0cur.h storage/innobase/include/btr0cur.ic storage/innobase/include/buf0buddy.h storage/innobase/include/buf0buddy.ic storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0lru.h storage/innobase/include/buf0types.h storage/innobase/include/db0err.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0mem.h storage/innobase/include/lock0lock.h storage/innobase/include/lock0lock.ic storage/innobase/include/mtr0mtr.ic storage/innobase/include/page0cur.ic storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/rem0rec.h storage/innobase/include/rem0rec.ic storage/innobase/include/rem0types.h storage/innobase/include/row0ext.h storage/innobase/include/row0ext.ic storage/innobase/include/row0row.h storage/innobase/include/row0row.ic storage/innobase/include/row0upd.ic storage/innobase/include/sync0rw.ic storage/innobase/include/sync0sync.h storage/innobase/include/trx0sys.h storage/innobase/include/trx0sys.ic storage/innobase/include/univ.i storage/innobase/lock/lock0lock.c storage/innobase/mtr/mtr0mtr.c storage/innobase/page/page0cur.c storage/innobase/page/page0page.c storage/innobase/page/page0zip.c storage/innobase/rem/rem0rec.c storage/innobase/row/row0ext.c storage/innobase/row/row0ins.c storage/innobase/row/row0mysql.c storage/innobase/row/row0row.c storage/innobase/row/row0sel.c storage/innobase/row/row0upd.c storage/innobase/row/row0vers.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0rec.c storage/innobase/ut/ut0ut.c storage/myisam/mi_update.c storage/myisam/mi_write.c tests/mysql_client_test.c vio/test-ssl.c vio/test-sslclient.c vio/test-sslserver.c vio/viossl.c vio/viosslfactories.c vio/viotest-ssl.c 3221 Bjorn Munch 2011-05-25 Increase test timeout for rpl.rpl_typeconv Not for test itself but because it procuces large number of warnings, and this may take >90s to filter on slow boxes added: mysql-test/suite/rpl/t/rpl_typeconv-master.opt Diff too large for email (16832 lines, the limit is 10000). No bundle (reason: useless for push emails).