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

[Magnus Blåudd]

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

 4248 Magnus Blåudd	2011-03-16
      ndb
       - move ndb_conflict_info* from include/ to suite/rpl_ndb/t/
       - remove unused rpl_ndb_conflict_init.inc

    removed:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_init.inc
    renamed:
      mysql-test/include/ndb_conflict_info.inc => mysql-test/suite/rpl_ndb/t/ndb_conflict_info.inc
      mysql-test/include/ndb_conflict_info_init.inc => mysql-test/suite/rpl_ndb/t/ndb_conflict_info_init.inc
    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
=== renamed file 'mysql-test/include/ndb_conflict_info.inc' => 'mysql-test/suite/rpl_ndb/t/ndb_conflict_info.inc'
=== renamed file 'mysql-test/include/ndb_conflict_info_init.inc' => 'mysql-test/suite/rpl_ndb/t/ndb_conflict_info_init.inc'
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_1.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_1.inc	2010-01-27 09:29:10 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_1.inc	2011-03-16 11:07:13 +0000
@@ -1,5 +1,5 @@
 --connection slave
---source include/ndb_conflict_info_init.inc
+--source suite/rpl_ndb/t/ndb_conflict_info_init.inc
 
 --connection master
 
@@ -32,7 +32,7 @@ commit;
 --connection slave
 select * from t1 order by a, d;
 select * from t2 order by a, d;
---source include/ndb_conflict_info.inc
+--source suite/rpl_ndb/t/ndb_conflict_info.inc
 
 --echo *** master - update 2 rows in different tables
 --connection master
@@ -43,7 +43,7 @@ update t2 set b="Master t2 a=3 at c=3",
 --connection slave
 select * from t1 order by a, d;
 select * from t2 order by a, d;
---source include/ndb_conflict_info.inc
+--source suite/rpl_ndb/t/ndb_conflict_info.inc
 
 --echo *** master - delete all
 --connection master
@@ -54,8 +54,8 @@ delete from t2;
 --connection slave
 select * from t1 order by a, d;
 select * from t2 order by a, d;
---source include/ndb_conflict_info.inc
---source include/ndb_conflict_info_init.inc
+--source suite/rpl_ndb/t/ndb_conflict_info.inc
+--source suite/rpl_ndb/t/ndb_conflict_info_init.inc
 
 --echo ************************
 --echo * start conflict testing
@@ -76,7 +76,7 @@ commit;
 --echo *** slave - check conflict info, no conflicts yet
 --sync_slave_with_master
 --connection slave
---source include/ndb_conflict_info.inc
+--source suite/rpl_ndb/t/ndb_conflict_info.inc
 
 --echo *** slave - check insert some data
 select * from t1 order by a, d;
@@ -110,7 +110,7 @@ commit;
 --echo *** slave - check conflict info, there should be some
 --sync_slave_with_master
 --connection slave
---source include/ndb_conflict_info.inc
+--source suite/rpl_ndb/t/ndb_conflict_info.inc
 
 --echo *** slave - check update some data that causes conflicts
 select * from t1 order by a, d;
@@ -133,7 +133,7 @@ commit;
 --echo *** slave - check conflict info, change depends on calling test
 --sync_slave_with_master
 --connection slave
---source include/ndb_conflict_info.inc
+--source suite/rpl_ndb/t/ndb_conflict_info.inc
 
 --echo *** slave - check higer timestamp
 select * from t1 order by a, d;

=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_init.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_init.inc	2009-02-16 15:54:40 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_init.inc	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
---echo *** reset and init
---disable_query_log
---disable_result_log
---connection slave
-stop slave;
-delete from t1;
---error 0,1146
-delete from `test`.`t1$EX`;
-
---connection master
-delete from t1;
-reset master;
-
---connection slave
-reset slave;
-start slave;
---source include/ndb_conflict_info_init.inc
---disable_query_log
---disable_result_log
-
---connection master
-insert into t1 values (1, "master X=1", 1, "1");
-insert into t1 values (2, "master X=1", 1, "2");
-insert into t1 values (3, "master X=1", 1, "3");
-
---sync_slave_with_master
---enable_query_log
---enable_result_log

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