diff options
| author | Sven Sandberg <sven@mysql.com> | 2008-08-04 07:04:47 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven@mysql.com> | 2008-08-04 07:04:47 +0200 |
| commit | 73e253370b22e226a68c119fe41b18cd94fd1170 (patch) | |
| tree | c4c5392cc5a65fb4236f8e309a373a02b05f0ef3 /mysql-test/t/disabled.def | |
| parent | b467c15e3694772b0da0930274a8dfc4a8ead030 (diff) | |
| parent | b1252a7ccf6af29a26f5c341a6ad6d1baaf965a2 (diff) | |
| download | mariadb-git-73e253370b22e226a68c119fe41b18cd94fd1170.tar.gz | |
merged 5.1 main to 5.1-rpl
manually resolved conflicts:
Text conflict in client/mysqltest.c
Contents conflict in mysql-test/include/have_bug25714.inc
Text conflict in mysql-test/include/have_ndbapi_examples.inc
Text conflict in mysql-test/mysql-test-run.pl
Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result
Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def
Text conflict in mysql-test/t/disabled.def
Diffstat (limited to 'mysql-test/t/disabled.def')
| -rw-r--r-- | mysql-test/t/disabled.def | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index c058992d795..d5c928213fe 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -95,5 +95,15 @@ transaction_alloc_block_size_basic_64 : Bug #36522: Some tests of system variabl transaction_prealloc_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms wait_timeout_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms log_tables.test : Bug #37798: main.log_tables fails randomly on powermacg5 and windows -slow_query_log_func.test : Bug #37962: *_func tests containing sleeps/race conditions - +wait_timeout_func : BUG#36873 2008-07-06 sven wait_timeout_func.test fails randomly +delayed_insert_limit_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +event_scheduler_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +innodb_max_dirty_pages_pct_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +interactive_timeout_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +query_cache_wlock_invalidate_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +rpl_init_slave_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +rpl_max_binlog_size_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +slow_query_log_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +sql_low_priority_updates_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +timestamp_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +log_output_func : BUG#37766 2008-07-10 sven main.log_output_func randomly fails in pushbuild |