bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4247)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4247 Magnus Blåudd	2011-03-16
      ndb
       - remove unused rpl_ndb_conflict_x_x.inc files

    removed:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_d_d.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_d_u.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_i_i.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_u_d.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_u_u.inc
=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_d_d.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_d_d.inc	2009-02-16 15:54:40 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_d_d.inc	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
---echo ***
---echo *** conflicting timestamps on delete-delete
---echo ***
-
---echo *** slave - cause conflict
---connection slave
---source include/ndb_conflict_info_init.inc
-update t1 set b="slave  X=3", X=3 where a=1;
-delete from t1 where a=1;
-
---echo *** master - cause conflict
---connection master
-delete from t1 where a=1;
-delete from t1 where a=2;
-
---echo *** slave - check data
---sync_slave_with_master
---connection slave
---source include/ndb_conflict_info.inc
-select * from t1 order by a;

=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_d_u.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_d_u.inc	2009-02-16 15:54:40 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_d_u.inc	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
---echo ***
---echo *** conflicting timestamps on delete-update
---echo ***
-
---echo *** slave - cause conflict
---connection slave
---source include/ndb_conflict_info_init.inc
-update t1 set b="slave  X=3", X=3 where a=1;
-
---echo *** master - cause conflict
---connection master
-delete from t1 where a=1;
-delete from t1 where a=2;
-
---echo *** slave - check data
---sync_slave_with_master
---connection slave
---source include/ndb_conflict_info.inc
-select * from t1 order by a;

=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_i_i.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_i_i.inc	2009-02-16 15:54:40 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_i_i.inc	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
---echo ***
---echo *** conflicting timestamps on insert
---echo ***
-
---connection master
-delete from t1 where a=1;
---sync_slave_with_master
-
---echo *** slave - cause conflict
---connection slave
---source include/ndb_conflict_info_init.inc
-insert into t1 values(1, "slave  X=3", 3, "1");
-
---echo *** master - cause conflict
---connection master
-insert into t1 values(1, "master X=2", 2, "1");
-
---echo *** slave - check data
---sync_slave_with_master
---connection slave
---source include/ndb_conflict_info.inc
-select * from t1 order by a;

=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_u_d.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_u_d.inc	2009-02-16 15:54:40 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_u_d.inc	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
---echo ***
---echo *** conflicting timestamps on update-delete
---echo ***
-
---echo *** slave - cause conflict
---connection slave
---source include/ndb_conflict_info_init.inc
-delete from t1 where a=1;
-
---echo *** master - cause conflict
---connection master
-update t1 set b="master X=2", X=2 where a=1;
-update t1 set b="master X=2", X=2 where a=2;
-
---echo *** slave - check data
---sync_slave_with_master
---connection slave
---source include/ndb_conflict_info.inc
-select * from t1 order by a;

=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_u_u.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_u_u.inc	2009-02-16 15:54:40 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_u_u.inc	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
---echo ***
---echo *** conflicting timestamps on update
---echo ***
-
---echo *** slave - cause conflict
---connection slave
---source include/ndb_conflict_info_init.inc
-update t1 set b="slave  X=3", X=3 where a=1;
-
---echo *** master - cause conflict
---connection master
-update t1 set b="master X=2", X=2 where a=1;
-update t1 set b="master X=2", X=2 where a=2;
-
---echo *** slave - check data
---sync_slave_with_master
---connection slave
---source include/ndb_conflict_info.inc
-select * from t1 order by a;

Attachment: [text/bzr-bundle] bzr/[e-mail]