Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into  damien-katzs-computer.local:/Users/dkatz/mysql51

1 files changed, 0 insertions, 71 deletions

diff --git a/mysql-test/t/rpl_truncate_7ndb.test b/mysql-test/t/rpl_truncate_7ndb.test
deleted file mode 100644
index f8933b3744d..00000000000
--- a/mysql-test/t/rpl_truncate_7ndb.test
+++ /dev/null
@@ -1,71 +0,0 @@
-
---source include/have_ndb.inc
---source include/ndb_master-slave.inc
---source include/have_binlog_format_mixed_or_row.inc
-
---disable_query_log
---disable_warnings
-connection slave;
-STOP SLAVE;
-connection master;
-DROP TABLE IF EXISTS t1;
-RESET MASTER;
-connection slave;
-DROP TABLE IF EXISTS t1;
-RESET SLAVE;
-START SLAVE;
---enable_warnings
---enable_query_log
-
---echo **** On Master ****
-connection master;
-CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,1), (2,2);
-SELECT * FROM t1 ORDER BY a,b;
---echo **** On Slave ****
-# This is silly, but NDB doesn't add to the binlog fast enough
---real_sleep 10
-sync_slave_with_master;
-INSERT INTO t1 VALUE (3,3);
-SELECT * FROM t1 ORDER BY a,b;
---echo **** On Master ****
-connection master;
-TRUNCATE TABLE t1;
-SELECT * FROM t1 ORDER BY a,b;
---echo **** On Slave ****
-sync_slave_with_master;
-# Should be empty
-SELECT * FROM t1 ORDER BY a,b;
---echo **** On Master ****
-connection master;
-DROP TABLE t1;
-let SERVER_VERSION=`select version()`;
---replace_regex /\/\* xid=[0-9]+ \*\//\/* xid= *\// /table_id: [0-9]+/table_id: #/
---replace_result $SERVER_VERSION SERVER_VERSION
-SHOW BINLOG EVENTS;
-
---echo **** On Master ****
-connection master;
-CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,1), (2,2);
-SELECT * FROM t1 ORDER BY a,b;
---echo **** On Slave ****
-sync_slave_with_master;
-INSERT INTO t1 VALUE (3,3);
-SELECT * FROM t1 ORDER BY a,b;
---echo **** On Master ****
-connection master;
-DELETE FROM t1;
-SELECT * FROM t1 ORDER BY a,b;
---echo **** On Slave ****
-sync_slave_with_master;
-# Should be empty
-SELECT * FROM t1 ORDER BY a,b;
---echo **** On Master ****
-connection master;
-DROP TABLE t1;
---replace_regex /table_id: [0-9]+/table_id: #/
---replace_result $SERVER_VERSION SERVER_VERSION
-SHOW BINLOG EVENTS;
-
--- source include/master-slave-end.inc