List:Commits« Previous MessageNext Message »
From:Hakan Kuecuekyilmaz Date:January 22 2009 3:53pm
Subject:bzr push into mysql-6.0-falcon-team branch (hky:2968 to 2969)
View as plain text  
 2969 Hakan Kuecuekyilmaz	2009-01-22
      Disabled failing test.
modified:
  mysql-test/suite/falcon/t/disabled.def

 2968 Hakan Kuecuekyilmaz	2009-01-22 [merge]
      Merged:
      mysql-6.0 --> mysql-6.0-falcon --> mysql-6.0-falcon-team.
removed:
  mysql-test/suite/parts/r/partition_bit_ndb.result
  mysql-test/suite/parts/t/partition_bit_ndb.test
  mysql-test/suite/parts/t/partition_sessions.test
  mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc
  mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result
  mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result
  mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test
  mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test
  mysql-test/t/log_bin_trust_function_creators_func-master.opt
  mysql-test/t/rpl_init_slave_func-slave.opt
added:
  extra/libevent/CMakeLists.txt
  extra/libevent/WIN32-Code/
  extra/libevent/WIN32-Code/config.h
  extra/libevent/WIN32-Code/misc.c
  extra/libevent/WIN32-Code/misc.h
  extra/libevent/WIN32-Code/tree.h
  extra/libevent/WIN32-Code/win32.c
  mysql-test/include/check_events_off.inc
  mysql-test/include/cleanup_fake_relay_log.inc
  mysql-test/include/have_one-thread-per-connection.inc
  mysql-test/include/have_simple_parser.inc
  mysql-test/include/no_running_event_scheduler.inc
  mysql-test/include/no_running_events.inc
  mysql-test/include/running_event_scheduler.inc
  mysql-test/include/setup_fake_relay_log.inc
  mysql-test/include/wait_condition_sp.inc
  mysql-test/r/fulltext_plugin.result
  mysql-test/r/have_simple_parser.require
  mysql-test/r/innodb_bug38231.result
  mysql-test/r/innodb_bug39438.result
  mysql-test/r/innodb_mysql_rbk.result
  mysql-test/r/partition_innodb_semi_consistent.result
  mysql-test/r/query_cache_28249.result
  mysql-test/std_data/bug40482-bin.000001
  mysql-test/suite/binlog/r/binlog_innodb_row.result
  mysql-test/suite/binlog/t/binlog_innodb_row.test
  mysql-test/suite/ddl_lock/
  mysql-test/suite/ddl_lock/README
  mysql-test/suite/ddl_lock/include/
  mysql-test/suite/ddl_lock/include/stress_settings.inc
  mysql-test/suite/ddl_lock/include/sync_lock.inc
  mysql-test/suite/ddl_lock/r/
  mysql-test/suite/ddl_lock/r/concurrent_ddl.result
  mysql-test/suite/ddl_lock/r/create_stress_tables.result
  mysql-test/suite/ddl_lock/r/stress_ddl.result
  mysql-test/suite/ddl_lock/r/stress_dml.result
  mysql-test/suite/ddl_lock/stress_init.txt
  mysql-test/suite/ddl_lock/stress_tests.txt
  mysql-test/suite/ddl_lock/t/
  mysql-test/suite/ddl_lock/t/concurrent_ddl.test
  mysql-test/suite/ddl_lock/t/create_stress_tables.test
  mysql-test/suite/ddl_lock/t/stress_ddl.test
  mysql-test/suite/ddl_lock/t/stress_dml.test
  mysql-test/suite/rpl/r/rpl_binlog_corruption.result
  mysql-test/suite/rpl/t/rpl_binlog_corruption-master.opt
  mysql-test/suite/rpl/t/rpl_binlog_corruption.test
  mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-master.opt
  mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-slave.opt
  mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
  mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
  mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
  mysql-test/t/change_user-master.opt
  mysql-test/t/fulltext_plugin-master.opt
  mysql-test/t/fulltext_plugin.test
  mysql-test/t/innodb_bug38231.test
  mysql-test/t/innodb_bug39438-master.opt
  mysql-test/t/innodb_bug39438.test
  mysql-test/t/innodb_mysql_rbk-master.opt
  mysql-test/t/innodb_mysql_rbk.test
  mysql-test/t/partition_innodb_semi_consistent-master.opt
  mysql-test/t/partition_innodb_semi_consistent.test
  mysql-test/t/query_cache_28249.test
  sql/debug_sync.h
  sql/share/errmsg-cnv.sh
  sql/share/errmsg-utf8.txt
renamed:
  mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result => mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
  mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test => mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
modified:
  CMakeLists.txt
  client/mysql.cc
  client/mysql_upgrade.c
  client/mysqlcheck.c
  client/mysqltest.c
  config/ac-macros/character_sets.m4
  extra/libevent/Makefile.am
  extra/libevent/buffer.c
  extra/libevent/evbuffer.c
  extra/libevent/evutil.c
  extra/libevent/evutil.h
  extra/resolve_stack_dump.c
  extra/yassl/include/openssl/ssl.h
  include/config-win.h
  include/m_ctype.h
  include/my_global.h
  include/mysql_com.h
  libmysqld/lib_sql.cc
  mysql-test/extra/binlog_tests/database.test
  mysql-test/extra/rpl_tests/rpl_auto_increment.test
  mysql-test/include/commit.inc
  mysql-test/include/have_32bit.inc
  mysql-test/include/have_64bit.inc
  mysql-test/include/index_merge1.inc
  mysql-test/include/linux_sys_vars.inc
  mysql-test/include/windows_sys_vars.inc
  mysql-test/lib/mtr_report.pl
  mysql-test/mysql-test-run.pl
  mysql-test/r/alter_table.result
  mysql-test/r/archive.result
  mysql-test/r/binlog_index.result
  mysql-test/r/cache_innodb.result
  mysql-test/r/change_user.result
  mysql-test/r/commit_1innodb.result
  mysql-test/r/create.result
  mysql-test/r/csv.result
  mysql-test/r/ctype_latin2_ch.result
  mysql-test/r/ctype_ldml.result
  mysql-test/r/ctype_ucs.result
  mysql-test/r/date_formats.result
  mysql-test/r/events_bugs.result
  mysql-test/r/events_scheduling.result
  mysql-test/r/fulltext.result
  mysql-test/r/func_if.result
  mysql-test/r/func_in.result
  mysql-test/r/func_str.result
  mysql-test/r/func_time.result
  mysql-test/r/grant.result
  mysql-test/r/greedy_optimizer.result
  mysql-test/r/having.result
  mysql-test/r/implicit_commit.result
  mysql-test/r/index_merge_myisam.result
  mysql-test/r/information_schema.result
  mysql-test/r/innodb-autoinc.result
  mysql-test/r/innodb-semi-consistent.result
  mysql-test/r/innodb_mysql.result
  mysql-test/r/log_bin_trust_function_creators_func.result
  mysql-test/r/log_state.result
  mysql-test/r/myisampack.result
  mysql-test/r/mysql.result
  mysql-test/r/mysqlcheck.result
  mysql-test/r/not_embedded_server.result
  mysql-test/r/partition.result
  mysql-test/r/partition_datatype.result
  mysql-test/r/partition_mgm.result
  mysql-test/r/partition_mgm_err.result
  mysql-test/r/partition_pruning.result
  mysql-test/r/ps.result
  mysql-test/r/query_cache.result
  mysql-test/r/rpl_init_slave_func.result
  mysql-test/r/select.result
  mysql-test/r/select_jcl6.result
  mysql-test/r/show_check.result
  mysql-test/r/sp-dynamic.result
  mysql-test/r/sp-vars.result
  mysql-test/r/sp.result
  mysql-test/r/sp_notembedded.result
  mysql-test/r/status.result
  mysql-test/r/strict.result
  mysql-test/r/temp_table.result
  mysql-test/r/trigger.result
  mysql-test/r/type_bit.result
  mysql-test/r/type_date.result
  mysql-test/r/type_float.result
  mysql-test/r/warnings_engine_disabled.result
  mysql-test/r/xml.result
  mysql-test/suite/binlog/r/binlog_database.result
  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
  mysql-test/suite/binlog/r/binlog_unsafe.result
  mysql-test/suite/falcon/r/falcon_bug_28049.result
  mysql-test/suite/falcon/r/falcon_bug_32833.result
  mysql-test/suite/falcon/r/falcon_bugs.result
  mysql-test/suite/funcs_1/datadict/basics_mixed1.inc
  mysql-test/suite/funcs_1/datadict/datadict_priv.inc
  mysql-test/suite/funcs_1/r/falcon_storedproc_02.result
  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
  mysql-test/suite/funcs_1/r/is_basics_mixed.result
  mysql-test/suite/funcs_1/r/is_columns_is.result
  mysql-test/suite/funcs_1/r/is_engines.result
  mysql-test/suite/funcs_1/r/memory_storedproc_02.result
  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
  mysql-test/suite/funcs_1/r/ndb_storedproc_02.result
  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_priv_ps.result
  mysql-test/suite/funcs_1/r/storedproc.result
  mysql-test/suite/funcs_1/storedproc/param_check.inc
  mysql-test/suite/funcs_1/t/is_basics_mixed.test
  mysql-test/suite/funcs_2/t/disabled.def
  mysql-test/suite/ndb/t/disabled.def
  mysql-test/suite/parts/r/partition_bit_innodb.result
  mysql-test/suite/parts/r/partition_bit_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result
  mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result
  mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result
  mysql-test/suite/parts/r/partition_special_innodb.result
  mysql-test/suite/parts/t/disabled.def
  mysql-test/suite/parts/t/partition_special_innodb.test
  mysql-test/suite/parts/t/partition_value_innodb.test
  mysql-test/suite/parts/t/partition_value_myisam.test
  mysql-test/suite/parts/t/partition_value_ndb.test
  mysql-test/suite/rpl/r/rpl_auto_increment.result
  mysql-test/suite/rpl/r/rpl_heartbeat.result
  mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
  mysql-test/suite/rpl/r/rpl_packet.result
  mysql-test/suite/rpl/r/rpl_row_create_table.result
  mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result
  mysql-test/suite/rpl/r/rpl_slave_skip.result
  mysql-test/suite/rpl/r/rpl_trigger.result
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/suite/rpl/t/rpl_packet.test
  mysql-test/suite/rpl/t/rpl_row_create_table.test
  mysql-test/suite/rpl/t/rpl_slave_skip.test
  mysql-test/suite/rpl/t/rpl_trigger.test
  mysql-test/suite/rpl_ndb/t/disabled.def
  mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
  mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
  mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
  mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
  mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
  mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
  mysql-test/suite/sys_vars/t/disabled.def
  mysql-test/t/alter_table.test
  mysql-test/t/archive.test
  mysql-test/t/change_user.test
  mysql-test/t/create.test
  mysql-test/t/csv.test
  mysql-test/t/ctype_latin2_ch.test
  mysql-test/t/ctype_ldml.test
  mysql-test/t/ctype_ucs.test
  mysql-test/t/date_formats.test
  mysql-test/t/disabled.def
  mysql-test/t/events_bugs.test
  mysql-test/t/events_scheduling.test
  mysql-test/t/fulltext.test
  mysql-test/t/func_if.test
  mysql-test/t/func_in.test
  mysql-test/t/func_str.test
  mysql-test/t/func_time.test
  mysql-test/t/grant.test
  mysql-test/t/greedy_optimizer.test
  mysql-test/t/having.test
  mysql-test/t/information_schema.test
  mysql-test/t/innodb-autoinc.test
  mysql-test/t/innodb-semi-consistent-master.opt
  mysql-test/t/innodb-semi-consistent.test
  mysql-test/t/innodb_mysql.test
  mysql-test/t/log_bin_trust_function_creators_func.test
  mysql-test/t/log_state.test
  mysql-test/t/myisampack.test
  mysql-test/t/mysql.test
  mysql-test/t/mysqlcheck.test
  mysql-test/t/not_embedded_server.test
  mysql-test/t/partition.test
  mysql-test/t/partition_innodb_stmt.test
  mysql-test/t/partition_mgm.test
  mysql-test/t/partition_pruning.test
  mysql-test/t/query_cache.test
  mysql-test/t/rpl_init_slave_func.test
  mysql-test/t/select.test
  mysql-test/t/sp.test
  mysql-test/t/status.test
  mysql-test/t/strict.test
  mysql-test/t/temp_table.test
  mysql-test/t/thread_cache_size_func.test
  mysql-test/t/trigger.test
  mysql-test/t/type_bit.test
  mysql-test/t/type_date.test
  mysql-test/t/type_float.test
  mysql-test/t/warnings_engine_disabled.test
  mysql-test/t/xml.test
  mysys/charset.c
  scripts/mysql_install_db.sh
  sql-common/my_time.c
  sql/CMakeLists.txt
  sql/Makefile.am
  sql/backup/be_default.cc
  sql/backup/be_snapshot.cc
  sql/backup/kernel.cc
  sql/backup/logger.h
  sql/ddl_blocker.cc
  sql/debug_sync.cc
  sql/field.cc
  sql/field.h
  sql/filesort.cc
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/handler.cc
  sql/handler.h
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_func.cc
  sql/item_func.h
  sql/item_strfunc.cc
  sql/item_sum.cc
  sql/item_timefunc.cc
  sql/item_timefunc.h
  sql/lock.cc
  sql/log.cc
  sql/log.h
  sql/log_event.cc
  sql/log_event.h
  sql/mdl.cc
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/opt_range.cc
  sql/partition_info.cc
  sql/protocol.cc
  sql/protocol.h
  sql/repl_failsafe.cc
  sql/rpl_constants.h
  sql/scheduler.cc
  sql/set_var.cc
  sql/share/errmsg.txt
  sql/slave.cc
  sql/sp.cc
  sql/sp_head.cc
  sql/spatial.h
  sql/sql_acl.cc
  sql/sql_base.cc
  sql/sql_binlog.cc
  sql/sql_cache.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_cursor.cc
  sql/sql_delete.cc
  sql/sql_error.cc
  sql/sql_error.h
  sql/sql_insert.cc
  sql/sql_join_cache.cc
  sql/sql_lex.h
  sql/sql_locale.cc
  sql/sql_parse.cc
  sql/sql_partition.cc
  sql/sql_plugin.cc
  sql/sql_plugin.h
  sql/sql_prepare.cc
  sql/sql_repl.cc
  sql/sql_select.cc
  sql/sql_select.h
  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.cc
  sql/table.h
  sql/unireg.cc
  storage/archive/ha_archive.cc
  storage/csv/ha_tina.cc
  storage/falcon/StorageVersion.h
  storage/federated/ha_federated.cc
  storage/heap/ha_heap.cc
  storage/innobase/btr/btr0sea.c
  storage/innobase/buf/buf0lru.c
  storage/innobase/dict/dict0dict.c
  storage/innobase/dict/dict0mem.c
  storage/innobase/handler/ha_innodb.cc
  storage/innobase/handler/ha_innodb.h
  storage/innobase/include/btr0sea.h
  storage/innobase/include/data0type.ic
  storage/innobase/include/dict0dict.h
  storage/innobase/include/dict0mem.h
  storage/innobase/include/ha_prototypes.h
  storage/innobase/include/hash0hash.ic
  storage/innobase/include/lock0lock.h
  storage/innobase/include/row0mysql.h
  storage/innobase/include/srv0srv.h
  storage/innobase/include/sync0sync.ic
  storage/innobase/lock/lock0lock.c
  storage/innobase/row/row0mysql.c
  storage/innobase/row/row0sel.c
  storage/innobase/srv/srv0srv.c
  storage/innobase/trx/trx0trx.c
  storage/innobase/trx/trx0undo.c
  storage/maria/ha_maria.cc
  storage/myisam/ft_boolean_search.c
  storage/myisam/ha_myisam.cc
  storage/myisam/myisam_backup_engine.cc
  storage/myisammrg/ha_myisammrg.cc
  strings/ctype-czech.c
  strings/ctype.c
  strings/xml.c
  tests/mysql_client_test.c
  mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test

=== modified file 'mysql-test/suite/falcon/t/disabled.def'
--- a/mysql-test/suite/falcon/t/disabled.def	2009-01-22 15:11:47 +0000
+++ b/mysql-test/suite/falcon/t/disabled.def	2009-01-22 15:52:18 +0000
@@ -10,3 +10,4 @@
 #
 ##############################################################################
 
+falcon_bug_22173 : Bug#42079 2009-01-13 joro Falcon does not reset auto_increment on transactional truncate

Thread
bzr push into mysql-6.0-falcon-team branch (hky:2968 to 2969)Hakan Kuecuekyilmaz22 Jan