Updated test

BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38:
  Delete: mysql-test/include/not_ndb_table.inc
BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a:
  Delete: mysql-test/r/not_ndb_table.require
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Cleanup test for NDB
mysql-test/t/rpl_foreign_key_innodb.test:
  Cleanup test for NDB
mysql-test/r/rpl_foreign_key_innodb.result:
  Cleanup test for NDB
mysql-test/t/rpl_optimize.test:
  setting back to orginal values

mysql-test/extra/rpl_tests/rpl_foreign_key.test

@@ -21,7 +21,7 @@ connection master;
 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;
 

mysql-test/include/not_ndb_table.inc

-#######################
-# Author: JBM
-# Date: 2006-01-17
-# Purpose: To skip a test when default-storage-engine=ndb
-#######################
--- require r/not_ndb_table.require
-disable_query_log;
-show variables like "table_type";
-enable_query_log;
-

mysql-test/r/not_ndb_table.require

-Variable_name	Value
-table_type	MyISAM

mysql-test/r/rpl_foreign_key_innodb.result

@@ -24,9 +24,9 @@ b	c
 6	11
 SELECT * FROM t1;
 a
+12
 10
 11
-12
 13
 SELECT * FROM t2;
 b	c
@@ -36,7 +36,7 @@ SET TIMESTAMP=1000000000;
 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;

mysql-test/t/rpl_foreign_key_innodb.test

@@ -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

mysql-test/t/rpl_optimize.test

@@ -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));