List:Commits« Previous MessageNext Message »
From:Bernt M. Johnsen Date:May 14 2012 8:49am
Subject:bzr push into mysql-trunk branch (bernt.johnsen:3669 to 3670)
View as plain text  
 3670 Bernt M. Johnsen	2012-05-10
      WL5602: Another CRL test needs to be disabled

    modified:
      mysql-test/t/disabled.def
 3669 Kristofer Pettersson	2012-05-09 [merge]
      automerge

    removed:
      mysql-test/suite/rpl/r/rpl_row_find_row_debug.result
      mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
      mysql-test/suite/sys_vars/r/innodb_analyze_is_persistent_basic.result
      mysql-test/suite/sys_vars/t/innodb_analyze_is_persistent_basic.test
    added:
      mysql-test/extra/rpl_tests/rpl_row_idempotency.test
      mysql-test/include/rpl_hash_scan_assertion.inc
      mysql-test/lib/My/Memcache.pm
      mysql-test/r/func_group_innodb_16k.result
      mysql-test/suite/binlog/std_data/ver_trunk_row_v2.001
      mysql-test/suite/innodb/include/innodb_dict.inc
      mysql-test/suite/innodb/include/innodb_stats_table_flag.inc
      mysql-test/suite/innodb/include/innodb_stats_table_flag_analyze.inc
      mysql-test/suite/innodb/r/innodb-alter-debug.result
      mysql-test/suite/innodb/r/innodb-alter.result
      mysql-test/suite/innodb/r/innodb_bug13867871.result
      mysql-test/suite/innodb/r/innodb_bug14007109.result
      mysql-test/suite/innodb/r/innodb_stats_create_on_corrupted.result
      mysql-test/suite/innodb/r/innodb_stats_create_table.result
      mysql-test/suite/innodb/r/innodb_stats_fetch.result
      mysql-test/suite/innodb/r/innodb_stats_fetch_corrupted.result
      mysql-test/suite/innodb/r/innodb_stats_fetch_nonexistent.result
      mysql-test/suite/innodb/r/innodb_stats_flag_global_off.result
      mysql-test/suite/innodb/r/innodb_stats_flag_global_on.result
      mysql-test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result
      mysql-test/suite/innodb/r/innodb_ut_format_name.result
      mysql-test/suite/innodb/t/innodb-alter-debug.test
      mysql-test/suite/innodb/t/innodb-alter.test
      mysql-test/suite/innodb/t/innodb_bug13867871.test
      mysql-test/suite/innodb/t/innodb_bug14007109.test
      mysql-test/suite/innodb/t/innodb_stats_create_on_corrupted.test
      mysql-test/suite/innodb/t/innodb_stats_create_table.test
      mysql-test/suite/innodb/t/innodb_stats_fetch.test
      mysql-test/suite/innodb/t/innodb_stats_fetch_corrupted.test
      mysql-test/suite/innodb/t/innodb_stats_fetch_nonexistent.test
      mysql-test/suite/innodb/t/innodb_stats_flag_global_off-master.opt
      mysql-test/suite/innodb/t/innodb_stats_flag_global_off.test
      mysql-test/suite/innodb/t/innodb_stats_flag_global_on-master.opt
      mysql-test/suite/innodb/t/innodb_stats_flag_global_on.test
      mysql-test/suite/innodb/t/innodb_upd_stats_if_needed_not_inited.test
      mysql-test/suite/innodb/t/innodb_ut_format_name.test
      mysql-test/suite/rpl/r/rpl_extra_row_data.result
      mysql-test/suite/rpl/r/rpl_row_hash_scan.result
      mysql-test/suite/rpl/r/rpl_row_hash_scan_sanity.result
      mysql-test/suite/rpl/t/rpl_extra_row_data-master.opt
      mysql-test/suite/rpl/t/rpl_extra_row_data-slave.opt
      mysql-test/suite/rpl/t/rpl_extra_row_data.test
      mysql-test/suite/rpl/t/rpl_report_port-master.opt
      mysql-test/suite/rpl/t/rpl_row_hash_scan.test
      mysql-test/suite/rpl/t/rpl_row_hash_scan_sanity.test
      mysql-test/suite/sys_vars/r/innodb_stats_persistent_basic.result
      mysql-test/suite/sys_vars/r/log_bin_use_v1_row_events_basic.result
      mysql-test/suite/sys_vars/r/slave_rows_search_algorithms_basic.result
      mysql-test/suite/sys_vars/t/innodb_stats_persistent_basic.test
      mysql-test/suite/sys_vars/t/log_bin_use_v1_row_events_basic.test
      mysql-test/suite/sys_vars/t/slave_rows_search_algorithms_basic.test
      mysql-test/t/func_group_innodb_16k.test
      storage/innobase/include/dict0stats.ic
      storage/innobase/include/ut0counter.h
      unittest/gunit/field_date-t.cc
      unittest/gunit/field_datetime-t.cc
      unittest/gunit/field_long-t.cc
      unittest/gunit/field_newdecimal-t.cc
      unittest/gunit/field_temporal_utils.h
      unittest/gunit/gunit_test_main_server.cc
      unittest/gunit/my_error-t.cc
    modified:
      client/mysqlbinlog.cc
      client/mysqldump.c
      configure.cmake
      extra/comp_err.c
      include/my_base.h
      include/my_sys.h
      libmysqld/lib_sql.cc
      man/CMakeLists.txt
      mysql-test/collections/default.daily
      mysql-test/collections/default.experimental
      mysql-test/collections/default.weekly
      mysql-test/extra/binlog_tests/binlog.test
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
      mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
      mysql-test/extra/rpl_tests/rpl_record_compare.test
      mysql-test/include/handler.inc
      mysql-test/include/index_merge2.inc
      mysql-test/include/order_by.inc
      mysql-test/include/subquery.inc
      mysql-test/include/wait_condition.inc
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/alter_table.result
      mysql-test/r/cast.result
      mysql-test/r/create.result
      mysql-test/r/ctype_collate.result
      mysql-test/r/ctype_create.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/r/drop.result
      mysql-test/r/events_2.result
      mysql-test/r/explain.result
      mysql-test/r/explain_json_all.result
      mysql-test/r/explain_json_none.result
      mysql-test/r/flush2.result
      mysql-test/r/func_time.result
      mysql-test/r/handler_innodb.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/information_schema.result
      mysql-test/r/mysql.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/mysqldump.result
      mysql-test/r/olap.result
      mysql-test/r/order_by_all.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/order_by_none.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_bka.result
      mysql-test/r/subquery_all_bka_nixbnl.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_nomat_nosj_bka.result
      mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result
      mysql-test/r/subquery_none.result
      mysql-test/r/subquery_none_bka.result
      mysql-test/r/subquery_none_bka_nixbnl.result
      mysql-test/r/type_bit.result
      mysql-test/r/type_temporal_fractional.result
      mysql-test/r/variables-big.result
      mysql-test/suite/binlog/r/binlog_old_versions.result
      mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/r/binlog_variables_log_bin.result
      mysql-test/suite/binlog/r/binlog_variables_log_bin_index.result
      mysql-test/suite/binlog/t/binlog_old_versions.test
      mysql-test/suite/engines/funcs/r/sq_all.result
      mysql-test/suite/engines/funcs/t/crash_manytables_string.test
      mysql-test/suite/engines/funcs/t/se_join_left_outer.test
      mysql-test/suite/engines/funcs/t/tc_partition_key.test
      mysql-test/suite/engines/funcs/t/tc_partition_linear_key.test
      mysql-test/suite/engines/iuds/t/strings_update_delete.test
      mysql-test/suite/explain_json_validate/r/explain_json_validate.result
      mysql-test/suite/innodb/include/innodb_stats.inc
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb_bug11933790.result
      mysql-test/suite/innodb/r/innodb_bug12429573.result
      mysql-test/suite/innodb/r/innodb_bug21704.result
      mysql-test/suite/innodb/r/innodb_corrupt_bit.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/r/innodb_stats.result
      mysql-test/suite/innodb/r/innodb_stats_drop_locked.result
      mysql-test/suite/innodb/t/innodb-blob.test
      mysql-test/suite/innodb/t/innodb-index-online.test
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/innodb/t/innodb_16k.test
      mysql-test/suite/innodb/t/innodb_bug11933790.test
      mysql-test/suite/innodb/t/innodb_bug12429573.test
      mysql-test/suite/innodb/t/innodb_bug21704.test
      mysql-test/suite/innodb/t/innodb_bug56680.test
      mysql-test/suite/innodb/t/innodb_corrupt_bit.test
      mysql-test/suite/innodb/t/innodb_monitor.test
      mysql-test/suite/innodb/t/innodb_stats.test
      mysql-test/suite/innodb/t/innodb_stats_drop_locked.test
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/parts/t/rpl_partition.test
      mysql-test/suite/perfschema/r/digest_table_full.result
      mysql-test/suite/perfschema/r/statement_digest.result
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
      mysql-test/suite/perfschema/r/statement_digest_long_query.result
      mysql-test/suite/rpl/r/rpl_alter_repository.result
      mysql-test/suite/rpl/r/rpl_bug26395.result
      mysql-test/suite/rpl/r/rpl_change_master_dbug.result
      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_filter_tables_not_exist.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_relayrotate.result
      mysql-test/suite/rpl/r/rpl_report_port.result
      mysql-test/suite/rpl/r/rpl_row_idempotency.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_relay_ign_space.result
      mysql-test/suite/rpl/t/rpl_alter_repository.test
      mysql-test/suite/rpl/t/rpl_bug26395.test
      mysql-test/suite/rpl/t/rpl_change_master_dbug.test
      mysql-test/suite/rpl/t/rpl_check_gtid.test
      mysql-test/suite/rpl/t/rpl_checksum_cache.test
      mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
      mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test
      mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test
      mysql-test/suite/rpl/t/rpl_optimize.test
      mysql-test/suite/rpl/t/rpl_parallel.test
      mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/rpl/t/rpl_relayrotate.test
      mysql-test/suite/rpl/t/rpl_report_port.test
      mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt
      mysql-test/suite/rpl/t/rpl_row_idempotency.test
      mysql-test/suite/rpl/t/rpl_row_img_eng_min.test
      mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test
      mysql-test/suite/rpl/t/rpl_row_img_idx_min.test
      mysql-test/suite/rpl/t/rpl_row_img_idx_noblob.test
      mysql-test/suite/rpl/t/rpl_row_mixing_engines.test
      mysql-test/suite/rpl/t/rpl_sequential.test
      mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test
      mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test
      mysql-test/suite/stress/t/ddl_innodb.test
      mysql-test/suite/sys_vars/r/bind_address_basic.result
      mysql-test/suite/sys_vars/t/bind_address_basic.test
      mysql-test/t/cast.test
      mysql-test/t/create.test
      mysql-test/t/ctype_collate.test
      mysql-test/t/ctype_create.test
      mysql-test/t/ctype_ucs.test
      mysql-test/t/ctype_utf8mb4.test
      mysql-test/t/drop.test
      mysql-test/t/events_2.test
      mysql-test/t/events_time_zone.test
      mysql-test/t/func_time.test
      mysql-test/t/greedy_optimizer.test
      mysql-test/t/handler_myisam.test
      mysql-test/t/index_merge_myisam.test
      mysql-test/t/information_schema.test
      mysql-test/t/innodb_explain_json_non_select_none.test
      mysql-test/t/mysql_client_test_embedded.test
      mysql-test/t/mysqldump.test
      mysql-test/t/olap.test
      mysql-test/t/overflow.test
      mysql-test/t/ssl_8k_key.test
      mysql-test/t/type_bit.test
      mysql-test/t/variables-big.test
      mysys/my_conio.c
      mysys/my_error.c
      scripts/mysql_system_tables.sql
      sql-common/my_time.c
      sql/binlog.cc
      sql/datadict.cc
      sql/derror.cc
      sql/event_db_repository.cc
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/filesort.cc
      sql/ha_partition.cc
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_buff.cc
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.h
      sql/item_subselect.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/lex.h
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/log_event_old.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_range.cc
      sql/opt_sum.cc
      sql/partition_info.cc
      sql/rpl_constants.h
      sql/rpl_info_factory.cc
      sql/rpl_info_table.cc
      sql/rpl_injector.cc
      sql/rpl_injector.h
      sql/rpl_slave.cc
      sql/rpl_utility.cc
      sql/rpl_utility.h
      sql/sp.cc
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_binlog.cc
      sql/sql_bitmap.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_db.cc
      sql/sql_executor.cc
      sql/sql_handler.cc
      sql/sql_help.cc
      sql/sql_insert.cc
      sql/sql_join_buffer.cc
      sql/sql_optimizer.cc
      sql/sql_parse.cc
      sql/sql_planner.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_test.cc
      sql/sql_time.cc
      sql/sql_tmp_table.cc
      sql/sql_union.cc
      sql/sql_update.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/table.cc
      sql/table.h
      sql/tztime.cc
      sql/unireg.cc
      storage/blackhole/ha_blackhole.h
      storage/csv/ha_tina.cc
      storage/federated/ha_federated.cc
      storage/innobase/CMakeLists.txt
      storage/innobase/api/api0api.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/buf/buf0dblwr.cc
      storage/innobase/buf/buf0flu.cc
      storage/innobase/buf/buf0lru.cc
      storage/innobase/buf/buf0rea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/dict/dict0mem.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/fts/fts0ast.cc
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0opt.cc
      storage/innobase/fts/fts0que.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0pcur.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0flu.ic
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0mem.h
      storage/innobase/include/dict0stats.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fts0ast.h
      storage/innobase/include/fts0priv.h
      storage/innobase/include/fts0priv.ic
      storage/innobase/include/fts0types.ic
      storage/innobase/include/lock0lock.h
      storage/innobase/include/os0sync.h
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0upd.ic
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0rw.h
      storage/innobase/include/sync0sync.h
      storage/innobase/include/sync0sync.ic
      storage/innobase/include/univ.i
      storage/innobase/include/ut0ut.h
      storage/innobase/lock/lock0lock.cc
      storage/innobase/lock/lock0wait.cc
      storage/innobase/log/log0log.cc
      storage/innobase/pars/pars0pars.cc
      storage/innobase/row/row0ftsort.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/row/row0upd.cc
      storage/innobase/srv/srv0mon.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/sync/sync0arr.cc
      storage/innobase/sync/sync0rw.cc
      storage/innobase/sync/sync0sync.cc
      storage/innobase/trx/trx0trx.cc
      storage/innobase/ut/ut0ut.cc
      unittest/gunit/CMakeLists.txt
      unittest/gunit/copy_info-t.cc
      unittest/gunit/create_field-t.cc
      unittest/gunit/decimal-t.cc
      unittest/gunit/dynarray-t.cc
      unittest/gunit/fake_table.h
      unittest/gunit/field-t.cc
      unittest/gunit/field_timestamp-t.cc
      unittest/gunit/get_diagnostics-t.cc
      unittest/gunit/item-t.cc
      unittest/gunit/item_func_now_local-t.cc
      unittest/gunit/join_tab_sort-t.cc
      unittest/gunit/my_decimal-t.cc
      unittest/gunit/opt_range-t.cc
      unittest/gunit/segfault-t.cc
      unittest/gunit/sql_table-t.cc
      unittest/gunit/stdcxx-t.cc
      unittest/gunit/test_utils.cc
      unittest/gunit/test_utils.h
      unittest/unit.pl
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2012-04-26 12:06:28 +0000
+++ b/mysql-test/t/disabled.def	2012-05-10 13:23:58 +0000
@@ -19,3 +19,4 @@ partition_locking_4	 : Bug#13924750 2012
 mysql_embedded_client_test	: Bug#13964673 2012-04-16 amitbha since most of the test cases are failing
 ssl_crl                    : Bug#14006448 2012-04-26 bernt
 ssl_crl_clrpath            : Bug#14006448 2012-04-26 bernt
+ssl_crl_clients_valid      : Bug#14006448 2012-05-09 bernt

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (bernt.johnsen:3669 to 3670) Bernt M. Johnsen14 May