database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Auto-merge from mysql-next-mr.

Browse Source
This commit is contained in:
Alexander Nozdrin
2010-02-09 13:40:08 +03:00
parent c7e7a7d20c 68ac1c9c28
commit 73ef80f47c
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/ndb/r/ndb_dd_ddl.result
View File

@@ -308,7 +308,7 @@ ENGINE = NDB;
DROP USER mysqltest_u1@localhost;
DROP USER mysqltest_u2@localhost;
DROP DATABASE IF EXISTS mysqltest2;
DROP DATABASE mysqltest2;
# -----------------------------------------------------------------
# End 6.0 test

4
mysql-test/suite/ndb/t/disabled.def
View File

@@ -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

2
mysql-test/suite/ndb/t/ndb_dd_ddl.test
View File

@@ -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 # -----------------------------------------------------------------