bk commit into 5.1 tree (jmiller:1.2062)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.2062 06/01/23 14:07:58 jmiller@stripped +1 -0
  rpl_foreign_key.test:
    Added comments on 1022 per Lars request

  mysql-test/extra/rpl_tests/rpl_foreign_key.test
    1.4 06/01/23 14:07:41 jmiller@stripped +2 -0
    Added comments on 1022 per Lars request

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.3/mysql-test/extra/rpl_tests/rpl_foreign_key.test	2006-01-20 23:38:11 +01:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_foreign_key.test	2006-01-23 14:07:41 +01:00
@@ -21,6 +21,8 @@
 SET TIMESTAMP=1000000000;
 CREATE TABLE t3 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
+# Had to add 1022 for run with ndb as ndb uses different
+# error and error code for 1062. Bug 16677
 --error 1022, 1062
 INSERT INTO t3 VALUES (1),(1);
 sync_slave_with_master;