diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-09 13:40:08 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-09 13:40:08 +0300 |
| commit | 73ef80f47cd4eda0b93b0f532846a8e16e021699 (patch) | |
| tree | 2d1f916af5cefa4b0ce771ba3fa1df54977ce23b /mysql-test/suite/ndb/t | |
| parent | c7e7a7d20cae8a22e7730b2015e08233d680ed02 (diff) | |
| parent | 68ac1c9c28c7cc7b06d508cdd110f0cde082ffea (diff) | |
| download | mariadb-git-73ef80f47cd4eda0b93b0f532846a8e16e021699.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'mysql-test/suite/ndb/t')
| -rw-r--r-- | mysql-test/suite/ndb/t/disabled.def | 4 | ||||
| -rw-r--r-- | mysql-test/suite/ndb/t/ndb_dd_ddl.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/ndb/t/disabled.def b/mysql-test/suite/ndb/t/disabled.def index b2aa3e515be..4c5c792f4ef 100644 --- a/mysql-test/suite/ndb/t/disabled.def +++ b/mysql-test/suite/ndb/t/disabled.def @@ -10,7 +10,9 @@ # ############################################################################## -ndb_partition_error2 : Bug#40989 ndb_partition_error2 needs maintenance +ndb_partition_error2 : Bug#40989 ndb_partition_error2 needs maintenance +ndb_condition_pushdown : Bug#49746 2010-02-08 alik ndb_condition_pushdown fails in mysql-next-mr + # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open ndb_alter_table3 : Bug#45621 2009-06-10 alik A few test files are disabled due to WL#4284 diff --git a/mysql-test/suite/ndb/t/ndb_dd_ddl.test b/mysql-test/suite/ndb/t/ndb_dd_ddl.test index 48d7b77c412..ca39be87c94 100644 --- a/mysql-test/suite/ndb/t/ndb_dd_ddl.test +++ b/mysql-test/suite/ndb/t/ndb_dd_ddl.test @@ -462,7 +462,7 @@ ENGINE = NDB; DROP USER mysqltest_u1@localhost; DROP USER mysqltest_u2@localhost; -DROP DATABASE IF EXISTS mysqltest2; +DROP DATABASE mysqltest2; --echo --echo # ----------------------------------------------------------------- |