diff options
| author | unknown <mskold@mysql.com> | 2004-11-22 12:02:32 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2004-11-22 12:02:32 +0100 |
| commit | 6c81b518c059d362aedbf8781f574d6fb55d30b5 (patch) | |
| tree | f9c833194cce943e65363c18040c635d92d08da1 /mysql-test | |
| parent | f72b5978c4ee05a72daae33e9d7353439d4041be (diff) | |
| parent | 5672598f0af4548f09959552eec9d766a792fe09 (diff) | |
| download | mariadb-git-6c81b518c059d362aedbf8781f574d6fb55d30b5.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ndb_index_unique.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/ndb_index_unique.test | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_index_unique.result b/mysql-test/r/ndb_index_unique.result index af9b84022ed..9754be84b17 100644 --- a/mysql-test/r/ndb_index_unique.result +++ b/mysql-test/r/ndb_index_unique.result @@ -87,6 +87,13 @@ a b c 7 8 3 8 2 3 drop table t2; +CREATE TABLE t2 ( +a int unsigned NOT NULL PRIMARY KEY, +b int unsigned not null, +c int unsigned, +UNIQUE USING HASH (b, c) +) engine=ndbcluster; +ERROR 42000: Column 'c' is used with UNIQUE or INDEX but is not defined as NOT NULL CREATE TABLE t3 ( a int unsigned NOT NULL, b int unsigned not null, diff --git a/mysql-test/t/ndb_index_unique.test b/mysql-test/t/ndb_index_unique.test index bdb23949763..3b7cecf6a69 100644 --- a/mysql-test/t/ndb_index_unique.test +++ b/mysql-test/t/ndb_index_unique.test @@ -58,6 +58,14 @@ select * from t2 order by a; drop table t2; +-- error 1121 +CREATE TABLE t2 ( + a int unsigned NOT NULL PRIMARY KEY, + b int unsigned not null, + c int unsigned, + UNIQUE USING HASH (b, c) +) engine=ndbcluster; + # # Show use of PRIMARY KEY USING HASH indexes # |