From: Marc Alff Date: June 27 2011 4:07pm Subject: bzr push into mysql-trunk-wl5378 branch (marc.alff:3357 to 3358) List-Archive: http://lists.mysql.com/commits/139927 Message-Id: <201106271607.p5RG7tVA031511@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3358 Marc Alff 2011-06-27 [merge] Merge mysql-trunk --> mysql-trunk-wl5378 removed: mysql-test/suite/innodb/include/innodb_stats_bootstrap.inc storage/innobase/scripts/ storage/innobase/scripts/persistent_storage.sql added: mysql-test/r/mysql_embedded.result mysql-test/suite/innodb/r/innodb_buffer_pool_load.result mysql-test/suite/innodb/t/innodb_buffer_pool_load-master.opt mysql-test/suite/innodb/t/innodb_buffer_pool_load.test mysql-test/suite/perfschema/r/table_schema.result mysql-test/suite/perfschema/t/table_schema.test mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_at_shutdown_basic.result mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_now_basic.result mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_abort_basic.result mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_at_startup_basic.result mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_now_basic.result mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_at_shutdown_basic.test mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_now_basic.test mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_abort_basic.test mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_at_startup_basic.test mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test mysql-test/t/mysql_embedded.test storage/innobase/buf/buf0dump.c storage/innobase/include/buf0dump.h unittest/gunit/bounds_checked_array-t.cc modified: cmake/os/WindowsCache.cmake config.h.cmake configure.cmake extra/perror.c extra/yassl/src/yassl_error.cpp libmysqld/lib_sql.cc mysql-test/mysql-test-run.pl mysql-test/r/1st.result mysql-test/r/alter_table.result mysql-test/r/connect.result mysql-test/r/flush.result mysql-test/r/log_tables_upgrade.result mysql-test/r/lowercase_table4.result mysql-test/r/multi_update.result mysql-test/r/multi_update_innodb.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysql_upgrade_ssl.result mysql-test/r/mysqlcheck.result mysql-test/r/plugin_auth.result mysql-test/r/ps.result mysql-test/r/sp_sync.result mysql-test/r/system_mysql_db.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/funcs_1/r/is_key_column_usage.result mysql-test/suite/funcs_1/r/is_statistics.result mysql-test/suite/funcs_1/r/is_statistics_mysql.result mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result mysql-test/suite/funcs_1/r/is_table_constraints.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result mysql-test/suite/funcs_1/r/is_tables_mysql.result mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/r/innodb-system-table-view.result mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/r/innodb_bug57904.result mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb-system-table-view.test mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb_bug11933790.test mysql-test/suite/innodb/t/innodb_bug57904.test mysql-test/suite/innodb/t/innodb_bug60049.test mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test mysql-test/suite/innodb/t/innodb_stats.test mysql-test/suite/innodb/t/innodb_stats_drop_locked.test mysql-test/suite/perfschema/include/cleanup_helper.inc mysql-test/suite/perfschema/include/upgrade_check.inc mysql-test/suite/perfschema/r/all_tests.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/selects.result mysql-test/suite/perfschema/t/all_tests.test mysql-test/suite/perfschema/t/selects.test mysql-test/t/alter_table.test mysql-test/t/flush.test mysql-test/t/multi_update.test mysql-test/t/multi_update_innodb.test mysql-test/t/ps.test mysql-test/t/sp_sync.test mysql-test/t/system_mysql_db_fix40123.test mysql-test/t/system_mysql_db_fix50030.test mysql-test/t/system_mysql_db_fix50117.test mysys/mf_pack.c scripts/mysql_install_db.pl.in scripts/mysql_install_db.sh scripts/mysql_system_tables.sql sql/event_scheduler.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_func.h sql/item_row.cc sql/item_row.h sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_sum.cc sql/log_event.cc sql/mdl.h sql/partition_info.cc sql/rpl_slave.cc sql/sp.cc sql/sp_head.cc sql/sql_admin.cc sql/sql_array.h sql/sql_base.cc sql/sql_base.h sql/sql_class.cc sql/sql_class.h sql/sql_db.cc sql/sql_derived.cc sql/sql_do.cc sql/sql_error.cc sql/sql_error.h sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_parse.cc sql/sql_plist.h sql/sql_prepare.cc sql/sql_prepare.h sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_table.cc sql/sql_test.cc sql/sql_union.cc sql/sql_update.cc sql/sql_yacc.yy sql/table.cc sql/table.h storage/innobase/CMakeLists.txt 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/buf/buf0rea.c storage/innobase/fil/fil0fil.c storage/innobase/handler/ha_innodb.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/buf0rea.h storage/innobase/include/buf0types.h storage/innobase/include/page0cur.ic storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/srv0srv.h storage/innobase/include/srv0start.h storage/innobase/include/sync0rw.ic storage/innobase/include/sync0sync.h storage/innobase/include/univ.i storage/innobase/include/ut0ut.h storage/innobase/page/page0cur.c storage/innobase/page/page0page.c storage/innobase/page/page0zip.c storage/innobase/rem/rem0rec.c storage/innobase/row/row0ins.c storage/innobase/row/row0row.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0sys.c storage/innobase/ut/ut0ut.c unittest/gunit/CMakeLists.txt 3357 Marc Alff 2011-06-13 [merge] Merge mysql-trunk --> mysql-trunk-wl5378 added: mysql-test/r/archive_debug.result mysql-test/t/archive_debug.test modified: .bzrignore 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/make_dist.cmake.in cmake/plugin.cmake configure.cmake include/mysql/plugin_audit.h include/mysql/plugin_audit.h.pp libmysql/authentication_win/plugin_client.cc libmysqld/emb_qcache.cc libmysqld/lib_sql.cc mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_auto_increment.test mysql-test/include/icp_tests.inc mysql-test/r/events_bugs.result mysql-test/r/gis-precise.result mysql-test/r/gis-rtree.result mysql-test/r/group_by.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_icp_none.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.result mysql-test/r/partition.result mysql-test/r/partition_datatype.result mysql-test/r/query_cache_28249.result mysql-test/r/sp_notembedded.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/suite/rpl/r/rpl_auto_increment.result mysql-test/t/disabled.def mysql-test/t/events_bugs.test mysql-test/t/gis-precise.test mysql-test/t/gis-rtree.test mysql-test/t/group_by.test mysql-test/t/partition.test mysql-test/t/partition_datatype.test mysql-test/t/query_cache_28249.test mysql-test/t/sp_notembedded.test mysql-test/t/symlink.test mysql-test/t/trigger-compat.test mysql-test/t/type_datetime.test plugin/audit_null/audit_null.c sql/binlog.cc sql/event_db_repository.cc sql/event_parse_data.cc sql/event_parse_data.h sql/event_scheduler.cc sql/field.cc sql/filesort.cc sql/gcalc_tools.cc sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/handler.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_row.cc sql/item_strfunc.cc sql/item_sum.cc sql/item_timefunc.cc sql/item_timefunc.h sql/log_event.cc sql/log_event_old.cc sql/mysqld.cc sql/opt_sum.cc sql/protocol.cc sql/rpl_master.cc sql/rpl_reporting.cc sql/rpl_rli.cc sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sp.cc sql/sp_head.cc sql/spatial.cc sql/sql_acl.cc sql/sql_admin.cc sql/sql_alloc_error_handler.cc sql/sql_audit.cc sql/sql_audit.h sql/sql_base.cc sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_derived.cc sql/sql_error.cc sql/sql_error.h sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_parse.cc sql/sql_prepare.cc sql/sql_prepare.h sql/sql_select.cc sql/sql_servers.cc sql/sql_show.cc sql/sql_signal.cc sql/sql_table.cc sql/sql_time.cc sql/sql_trigger.cc sql/sql_trigger.h sql/sql_update.cc sql/sql_yacc.yy sql/structs.h sql/sys_vars.cc sql/table.cc sql/transaction.cc sql/tztime.cc storage/archive/azio.c storage/archive/ha_archive.cc storage/innobase/btr/btr0cur.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0lru.c storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/rem0rec.h storage/innobase/include/rem0rec.ic storage/innobase/include/trx0trx.h storage/innobase/lock/lock0lock.c storage/innobase/row/row0row.c storage/innobase/row/row0vers.c storage/innobase/trx/trx0rec.c storage/myisam/mi_update.c storage/myisam/mi_write.c tests/mysql_client_test.c Diff too large for email (11749 lines, the limit is 10000). No bundle (reason: useless for push emails).