From: Alexander Nozdrin Date: March 24 2011 8:45am Subject: bzr push into mysql-trunk branch (alexander.nozdrin:3530 to 3531) List-Archive: http://lists.mysql.com/commits/133730 Message-Id: <201103240845.p2O8jSpX028889@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3531 Alexander Nozdrin 2011-03-24 Restore default set of MTR test suites running in PB. modified: mysql-test/collections/mysql-trunk-bug27480.push 3530 Alexander Nozdrin 2011-03-09 [merge] Merge from mysql-trunk. removed: mysql-test/include/have_case_insensitive_fs.inc mysql-test/r/case_insensitive_fs.require mysql-test/r/crash_commit_before.result mysql-test/t/crash_commit_before-master.opt mysql-test/t/crash_commit_before.test mysql-test/t/partition-master.opt storage/innobase/include/ut0bh.h storage/innobase/ut/ut0bh.c added: mysql-test/collections/disabled-weekly.list mysql-test/include/check_qep.inc mysql-test/include/expect_qep.inc mysql-test/r/func_encrypt_ucs2.result mysql-test/std_data/bug47205.frm mysql-test/suite/binlog/r/rpl_crash_safe_master_checksum.result mysql-test/suite/binlog/t/rpl_crash_safe_master_checksum-master.opt mysql-test/suite/binlog/t/rpl_crash_safe_master_checksum.test mysql-test/suite/rpl/r/rpl_crash_safe_master.result mysql-test/suite/rpl/t/rpl_crash_safe_master.test mysql-test/suite/sys_vars/r/core_file_basic.result mysql-test/suite/sys_vars/t/core_file_basic-master.opt mysql-test/suite/sys_vars/t/core_file_basic.test mysql-test/t/func_encrypt_ucs2.test storage/innobase/include/ut0bh.h storage/innobase/include/ut0bh.ic storage/innobase/ut/ut0bh.c modified: VERSION client/mysql.cc client/mysqlcheck.c client/mysqltest.cc cmake/make_dist.cmake.in include/my_pthread.h include/my_sys.h mysql-test/collections/default.experimental mysql-test/extra/binlog_tests/ctype_cp932.test mysql-test/include/mysqld--help.inc mysql-test/include/wait_for_status_var.inc mysql-test/r/ctype_latin1.result mysql-test/r/ctype_ldml.result mysql-test/r/ctype_sjis.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_utf16.result mysql-test/r/ctype_utf32.result mysql-test/r/ctype_utf8.result mysql-test/r/ddl_i18n_koi8r.result mysql-test/r/ddl_i18n_utf8.result mysql-test/r/filesort_debug.result mysql-test/r/flush.result mysql-test/r/func_set.result mysql-test/r/greedy_optimizer.result mysql-test/r/innodb_mysql_sync.result mysql-test/r/join.result mysql-test/r/join_cache_jcl1.result mysql-test/r/join_cache_jcl2.result mysql-test/r/join_cache_jcl3.result mysql-test/r/join_cache_jcl4.result mysql-test/r/lock.result mysql-test/r/log_state.result mysql-test/r/log_tables.result mysql-test/r/mysqlcheck.result mysql-test/r/partition.result mysql-test/r/status.result mysql-test/r/subquery_sj_none.result mysql-test/r/system_mysql_db.result mysql-test/r/xml.result mysql-test/std_data/Index.xml mysql-test/suite/binlog/r/binlog_index.result mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test mysql-test/suite/binlog/t/binlog_index.test mysql-test/suite/engines/iuds/r/insert_year.result mysql-test/suite/engines/iuds/t/disabled.def mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/large_tests/t/lock_tables_big.test mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_000001.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result mysql-test/suite/rpl/t/rpl_checksum.test mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/rpl/t/rpl_manual_change_index_file.test mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test mysql-test/suite/rpl/t/rpl_stm_000001.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result mysql-test/suite/sys_vars/r/slow_query_log_func.result mysql-test/suite/sys_vars/t/slow_query_log_func.test mysql-test/t/ctype_latin1.test mysql-test/t/ctype_ldml.test mysql-test/t/ctype_sjis.test mysql-test/t/ctype_ucs.test mysql-test/t/ctype_utf16.test mysql-test/t/ctype_utf32.test mysql-test/t/ctype_utf8.test mysql-test/t/filesort_debug.test mysql-test/t/flush.test mysql-test/t/func_set.test mysql-test/t/grant.test mysql-test/t/grant_lowercase_fs.test mysql-test/t/greedy_optimizer.test mysql-test/t/innodb_mysql_sync.test mysql-test/t/lock.test mysql-test/t/log_state.test mysql-test/t/log_tables.test mysql-test/t/mysql.test mysql-test/t/mysql_cp932.test mysql-test/t/mysqlbinlog-cp932.test mysql-test/t/mysqlcheck.test mysql-test/t/partition.test mysql-test/t/xml.test mysys/default.c mysys/my_conio.c mysys/my_init.c mysys/my_rename.c mysys/my_thr_init.c mysys/stacktrace.c scripts/mysql_system_tables.sql scripts/mysql_system_tables_fix.sql scripts/mysqld_multi.sh scripts/mysqldumpslow.sh sql-common/client.c sql/binlog.cc sql/binlog.h sql/filesort.cc sql/handler.cc sql/handler.h sql/item.cc sql/item_cmpfunc.cc sql/item_func.cc sql/item_strfunc.cc sql/item_strfunc.h sql/log.cc sql/log.h sql/log_event.cc sql/mysqld.cc sql/mysqld.h sql/opt_range.cc sql/share/errmsg-utf8.txt sql/sql_admin.cc sql/sql_base.cc sql/sql_base.h sql/sql_lex.h sql/sql_parse.cc sql/sql_plugin.cc sql/sql_reload.cc sql/sql_select.cc sql/sql_table.cc sql/sql_trigger.cc sql/sql_truncate.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/sys_vars.h storage/archive/ha_archive.h storage/csv/ha_tina.h storage/federated/ha_federated.h storage/innobase/CMakeLists.txt storage/innobase/handler/ha_innodb.cc storage/innobase/include/buf0flu.h storage/innobase/include/srv0srv.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0purge.h storage/innobase/include/trx0rseg.h storage/innobase/include/trx0sys.h storage/innobase/include/trx0sys.ic storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0rseg.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c storage/innobase/ut/ut0ut.c storage/myisam/ha_myisam.cc storage/perfschema/unittest/pfs-t.cc storage/perfschema/unittest/pfs_instr-oom-t.cc storage/perfschema/unittest/pfs_instr-t.cc storage/perfschema/unittest/pfs_instr_class-oom-t.cc storage/perfschema/unittest/pfs_instr_class-t.cc storage/perfschema/unittest/pfs_timer-t.cc strings/ctype-uca.c strings/ctype.c strings/xml.c === modified file 'mysql-test/collections/mysql-trunk-bug27480.push' --- a/mysql-test/collections/mysql-trunk-bug27480.push 2011-02-07 10:29:32 +0000 +++ b/mysql-test/collections/mysql-trunk-bug27480.push 2011-03-24 08:45:04 +0000 @@ -1,21 +1,4 @@ -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=normal --vardir=var-normal --report-features -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --skip-ndb -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --mysqld=--binlog-format=row --ps-protocol -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-embedded --embedded -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps_funcs1 --vardir=var-ps_funcs_1 --suite=funcs_1 --ps-protocol -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=funcs2 --vardir=var-funcs2 --suite=funcs_2 -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=partitions --vardir=var-parts --suite=parts -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=stress --vardir=var-stress --suite=stress -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=jp --vardir=var-jp --suite=jp -perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_checksum --vardir=var-rpl_binlog_checksum --suite=rpl,binlog --mysqld=--binlog-checksum=CRC32 - -perl mysql-test-run.pl --timer --force --parallel=auto --comment=all_binlog_checksum --experimental=collections/default.experimental --mysqld=--binlog-checksum=CRC32 --vardir=var-all_binlog_checksum --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema -perl mysql-test-run.pl --timer --force --parallel=auto --comment=big-tests --experimental=collections/default.experimental --vardir=var-big-tests --big-test --testcase-timeout=60 --suite-timeout=600 main.alter_table-big main.archive-big main.count_distinct3 main.create-big main.events_stress main.events_time_zone main.information_schema-big main.log_tables-big main.merge-big main.mysqlbinlog_row_big main.read_many_rows_innodb main.ssl-big main.sum_distinct-big main.type_newdecimal-big main.variables-big parts.part_supported_sql_func_innodb parts.partition_alter1_1_2_innodb parts.partition_alter1_2_innodb parts.partition_alter2_1_1_innodb parts.partition_alter2_1_2_innodb parts.partition_alter2_2_2_innodb parts.partition_alter4_innodb -perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam -perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-rpl-binlog-row-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=row -perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-rpl-binlog-mixed-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=mixed -perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb -perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-rpl-binlog-row-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=row -perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed +perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list +perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list +perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb +perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb No bundle (reason: useless for push emails).