Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines


mysql-test/r/ndb_update.result:
  SCCS merged

mysql-test/r/ndb_update.result

@@ -31,11 +31,3 @@ pk1	b	c
 12	2	2
 14	1	1
 DROP TABLE IF EXISTS t1;
-CREATE TABLE t1(a INT NOT NULL, UNIQUE(a)) ENGINE=ndbcluster;
-INSERT INTO t1 VALUES(1),(2);
-UPDATE IGNORE t1, t1 AS t1a SET t1.a=3;
-SELECT a FROM t1 ORDER BY a;
-a
-2
-3
-DROP TABLE t1;

mysql-test/t/ndb_update.test

@@ -33,13 +33,4 @@ select * from t1 order by pk1;
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
-#
-# BUG#21381 - Engine not notified about multi-table UPDATE IGNORE
-#
-CREATE TABLE t1(a INT NOT NULL, UNIQUE(a)) ENGINE=ndbcluster;
-INSERT INTO t1 VALUES(1),(2);
-UPDATE IGNORE t1, t1 AS t1a SET t1.a=3;
-SELECT a FROM t1 ORDER BY a;
-DROP TABLE t1;
-
 # End of 4.1 tests