summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoreland@mysql.com <>2005-02-01 17:09:36 +0100
committerjoreland@mysql.com <>2005-02-01 17:09:36 +0100
commit1839f7407ec5e60a884a0abbf01a72b5808c89f0 (patch)
tree0ad9682685838d4ab17c2dc315158db732578755
parentf2639d3852dfc4ff6f6af0f4194e18e05bf1acf7 (diff)
parent08b302894c340c8208844a599db8782c6d0ca0f7 (diff)
downloadmariadb-git-1839f7407ec5e60a884a0abbf01a72b5808c89f0.tar.gz
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
-rw-r--r--mysql-test/r/ndb_index_unique.result2
-rw-r--r--mysql-test/t/ndb_index_unique.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ndb_index_unique.result b/mysql-test/r/ndb_index_unique.result
index 598b9dcccf7..517d09ddf29 100644
--- a/mysql-test/r/ndb_index_unique.result
+++ b/mysql-test/r/ndb_index_unique.result
@@ -1,4 +1,4 @@
-drop table if exists t1, t2, t3, t4, t5, t6, t7;
+drop table if exists t1, t2, t3, t4, t5, t6, t7, t8;
CREATE TABLE t1 (
a int unsigned NOT NULL PRIMARY KEY,
b int unsigned not null,
diff --git a/mysql-test/t/ndb_index_unique.test b/mysql-test/t/ndb_index_unique.test
index 9bbea75028b..2fc7c496fea 100644
--- a/mysql-test/t/ndb_index_unique.test
+++ b/mysql-test/t/ndb_index_unique.test
@@ -1,7 +1,7 @@
-- source include/have_ndb.inc
--disable_warnings
-drop table if exists t1, t2, t3, t4, t5, t6, t7;
+drop table if exists t1, t2, t3, t4, t5, t6, t7, t8;
--enable_warnings
#