diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-12-31 01:04:59 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-12-31 01:04:59 +0100 |
| commit | 002d7efa478878565805810dda4bb37bd5dcd32e (patch) | |
| tree | b030e2a97457bcce43d57b586e30ec006bca32d5 /mysql-test/t/disabled.def | |
| parent | 3099886cda04701283645d1c59d04c7b2e66966c (diff) | |
| parent | 0968cc9dec13ddc3352eeff73aa8ebb3eecb0213 (diff) | |
| download | mariadb-git-002d7efa478878565805810dda4bb37bd5dcd32e.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/main/mysql-5.1
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
storage/ndb/include/kernel/signaldata/Extent.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Auto merged
storage/ndb/src/kernel/blocks/diskpage.hpp:
Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/print_file.cpp:
Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/tsman.hpp:
Auto merged
storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp:
Auto merged
Diffstat (limited to 'mysql-test/t/disabled.def')
| -rw-r--r-- | mysql-test/t/disabled.def | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 1c7ac8f6dba..ce7bb345aad 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -21,7 +21,6 @@ ndb_restore_partition : Problem with cluster/def/schema table that is in std_ rpl_ndb_sync : Problem with cluster/def/schema table that is in std_data/ndb_backup51; Pekka will schdule this to someone partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table -ps_7ndb : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated rpl_ndb_2myisam : BUG#19227 Seems to pass currently rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD @@ -34,8 +33,8 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open #ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events -ndb_binlog_discover : bug#21806 2006-08-24 -ndb_autodiscover3 : bug#21806 +#ndb_binlog_discover : bug#21806 2006-08-24 +#ndb_autodiscover3 : bug#21806 flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin mysql_upgrade : Bug#25074 mysql_upgrade gives inconsisten results |