diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-03-22 16:06:34 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-03-22 16:06:34 +0100 |
| commit | 0fcf49b448321d2b9d13e2c0310fd0537bf7d766 (patch) | |
| tree | 256ba9692a340cc8bad8d4b59c6c985922c638f4 /mysql-test | |
| parent | 4ab459ce795a7999b79817abc035f73d63c972fd (diff) | |
| parent | 5c207e336d9fdd3b3842dfbb52d298a38a0e9ab9 (diff) | |
| download | mariadb-git-0fcf49b448321d2b9d13e2c0310fd0537bf7d766.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/t/disabled.def:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/ndb/ndb_config_2_node.ini | 3 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini index e7a12dbde77..26ed928a7cf 100644 --- a/mysql-test/ndb/ndb_config_2_node.ini +++ b/mysql-test/ndb/ndb_config_2_node.ini @@ -12,6 +12,9 @@ MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes TimeBetweenGlobalCheckpoints= 500 NoOfFragmentLogFiles= 3 DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory +# the following parametes just function as a small regression +# test that the parameter exists +InitialNoOfOpenFiles= 27 [ndbd] HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 302ddba3c81..708501a1cf9 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -23,8 +23,8 @@ partition_03ndb : Bug#16385 ps_7ndb : dbug assert in RBR mode when executing test suite #rpl_bit_npk : Bug#13418 rpl_ddl : Bug#15963 SBR does not show "Definer" correctly -rpl_ndb_2innodb : Assert failure in ha_partition::extra() -rpl_ndb_2myisam : Assert failure in ha_partition::extra() +rpl_ndb_2innodb : assertion in get_parts_for_update() +rpl_ndb_2myisam : assertion in get_parts_for_update() rpl_ndb_auto_inc : Bug#17086 #rpl_ndb_basic : Bug#16228 [IN REVIEW] rpl_ndb_blob : interferes with following tests, causing hang |