bk commit into 5.1 tree (jmiller:1.2060)

[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.2060 06/01/20 23:28:52 jmiller@stripped +6 -0
  Updated test

  mysql-test/t/rpl_optimize.test
    1.6 06/01/20 23:28:05 jmiller@stripped +1 -3
    setting back to orginal values

  mysql-test/r/rpl_foreign_key_innodb.result
    1.2 06/01/20 17:38:32 jmiller@stripped +2 -2
    Cleanup test for NDB

  mysql-test/t/rpl_foreign_key_innodb.test
    1.3 06/01/20 17:38:14 jmiller@stripped +0 -1
    Cleanup test for NDB

  mysql-test/extra/rpl_tests/rpl_foreign_key.test
    1.2 06/01/20 17:38:04 jmiller@stripped +1 -1
    Cleanup test for NDB

  BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a
    1.2 06/01/20 14:23:45 jmiller@stripped +0 -0
    Delete: mysql-test/r/not_ndb_table.require

  BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38
    1.3 06/01/20 14:23:27 jmiller@stripped +0 -0
    Delete: mysql-test/include/not_ndb_table.inc

# 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.5/mysql-test/t/rpl_optimize.test	2006-01-17 20:35:09 +01:00
+++ 1.6/mysql-test/t/rpl_optimize.test	2006-01-20 23:28:05 +01:00
@@ -4,10 +4,8 @@
 #####################################
 # Change Author: JBM
 # Change Date: 2006-01-17
-# Change: Skip test when default table = ndb
+# Change: 
 #####################################
-
--- source include/not_ndb_table.inc
 -- source include/master-slave.inc
 
 create table t1 (a int not null auto_increment primary key, b int, key(b));

--- 1.1/mysql-test/extra/rpl_tests/rpl_foreign_key.test	2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_foreign_key.test	2006-01-20 17:38:04 +01:00
@@ -21,7 +21,7 @@
 SET TIMESTAMP=1000000000;
 CREATE TABLE t3 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
---error 1062
+--error 1022, 1062
 INSERT INTO t3 VALUES (1),(1);
 sync_slave_with_master;
 

--- 1.1/mysql-test/r/rpl_foreign_key_innodb.result	2005-12-22 06:34:51 +01:00
+++ 1.2/mysql-test/r/rpl_foreign_key_innodb.result	2006-01-20 17:38:32 +01:00
@@ -24,9 +24,9 @@
 6	11
 SELECT * FROM t1;
 a
+12
 10
 11
-12
 13
 SELECT * FROM t2;
 b	c
@@ -36,7 +36,7 @@
 CREATE TABLE t3 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
 INSERT INTO t3 VALUES (1),(1);
-ERROR 23000: Duplicate entry '1' for key 1
+Got one of the listed errors
 SET FOREIGN_KEY_CHECKS=0;
 DROP TABLE IF EXISTS t1,t2,t3;
 SET FOREIGN_KEY_CHECKS=1;

--- 1.2/mysql-test/t/rpl_foreign_key_innodb.test	2006-01-17 20:25:17 +01:00
+++ 1.3/mysql-test/t/rpl_foreign_key_innodb.test	2006-01-20 17:38:14 +01:00
@@ -5,7 +5,6 @@
 # Change Date: 2006-01-17
 # Change: FK not supported, skip test when NDB is forced
 ####################################
--- source include/not_ndb_table.inc
 -- source include/have_innodb.inc
 let $engine_type=INNODB;
 -- source extra/rpl_tests/rpl_foreign_key.test