bk commit into 5.0 tree (svoj:1.2292)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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@stripped, 2006-10-06 14:49:21+05:00, svoj@stripped +2 -0
  Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
  into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
  MERGE: 1.1616.2144.206

  mysql-test/r/ndb_update.result@stripped, 2006-10-06 14:49:18+05:00, svoj@stripped +0 -8
    Auto merged
    MERGE: 1.2.1.4

  mysql-test/t/ndb_update.test@stripped, 2006-10-06 14:49:18+05:00, svoj@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.5

# 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:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines/RESYNC

--- 1.8/mysql-test/r/ndb_update.result	2006-10-06 14:49:26 +05:00
+++ 1.9/mysql-test/r/ndb_update.result	2006-10-06 14:49:26 +05:00
@@ -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
-1
-3
-DROP TABLE t1;

--- 1.6/mysql-test/t/ndb_update.test	2006-10-06 14:49:26 +05:00
+++ 1.7/mysql-test/t/ndb_update.test	2006-10-06 14:49:26 +05:00
@@ -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