bk commit into 5.1 tree (mskold:1.2364)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2364 06/04/26 15:38:11 mskold@stripped +2 -0
  Added test for violation of uniqueness constraint at create index

  mysql-test/r/ndb_index_unique.result
    1.23 06/04/26 15:37:19 mskold@stripped +2 -0
    Added test for violation of uniqueness constraint at create index

  mysql-test/t/ndb_index_unique.test
    1.21 06/04/26 15:37:18 mskold@stripped +2 -2
    Added test for violation of uniqueness constraint at create index

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-5.1-new

--- 1.22/mysql-test/r/ndb_index_unique.result	2006-03-10 11:27:44 +01:00
+++ 1.23/mysql-test/r/ndb_index_unique.result	2006-04-26 15:37:19 +02:00
@@ -45,6 +45,8 @@
 8	2	3
 alter table t1 drop index ib;
 insert into t1 values(1, 2, 3);
+create unique index ib on t1(b);
+ERROR 23000: Can't write, because of unique constraint, to table 't1'
 drop table t1;
 CREATE TABLE t1 (
 a int unsigned NOT NULL PRIMARY KEY,

--- 1.20/mysql-test/t/ndb_index_unique.test	2006-03-10 11:27:44 +01:00
+++ 1.21/mysql-test/t/ndb_index_unique.test	2006-04-26 15:37:18 +02:00
@@ -32,8 +32,8 @@
 alter table t1 drop index ib;
 insert into t1 values(1, 2, 3);
 # Bug# #18129
-#--error 1169
-#create unique index ib on t1(b);
+--error 1169
+create unique index ib on t1(b);
 
 drop table t1;