Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

mysql-test/r/ndb_index_unique.result

@@ -45,6 +45,8 @@ a	b	c
 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,

mysql-test/t/ndb_index_unique.test

@@ -32,8 +32,8 @@ select * from t1 order by a;
 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;