List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:April 15 2011 11:42am
Subject:bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3288)
View as plain text  
#At file:///data0/magnus/mysql/5.5-cluster/ based on revid:magnus.blaudd@stripped4

 3288 Magnus Blåudd	2011-04-15
      rpl_ndb
       - record .result file for new rpl script output

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_eng_trans.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE IF EXISTS test.t1;
 CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, vchar_column VARCHAR(100), PRIMARY KEY(a)) engine=NDB;
@@ -38,3 +34,4 @@ DROP PROCEDURE test.p1;
 DROP FUNCTION test.fn1;
 DROP TABLE test.t1;
 DROP TABLE test.t2;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 CREATE TABLE t1 (a INT) ENGINE=NDB;
 begin;
 insert into t1 values(1);
@@ -11,3 +7,4 @@ flush tables with read lock;
 commit;
 unlock tables;
 drop table t1;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 DROP TABLE IF EXISTS t1;
 CREATE LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile.dat'
@@ -70,3 +66,4 @@ drop datafile 'datafile02.dat'
 engine=ndb;
 DROP TABLESPACE ts1 ENGINE=NDB;
 DROP LOGFILE GROUP lg1 ENGINE=NDB;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 create table t1 (a int, b int) engine=NDB;
 insert into t1 values(1,1);
 select * from t1;
@@ -13,3 +9,4 @@ delete from t1;
 select * from t1;
 a	b
 drop table t1;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 DROP DATABASE IF EXISTS replica;
 CREATE DATABASE replica;
 CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
@@ -56,3 +52,4 @@ Tables_in_test
 USE test;
 DROP TABLE t1, t2;
 DROP DATABASE IF EXISTS replica;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
 CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
@@ -24,3 +20,4 @@ ERROR 23000: Duplicate entry '3' for key
 INSERT INTO t1 VALUES (3, repeat('bad too',1));
 ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
 DROP TABLE IF EXISTS t1, t2;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 CALL mtr.add_suppression('Statement may not be safe to log in statement format.');
 DROP FUNCTION IF EXISTS test.f1;
 DROP TABLE IF EXISTS test.t1;
@@ -28,3 +24,4 @@ ROLLBACK;
 SET AUTOCOMMIT=1;
 DROP FUNCTION test.f1;
 DROP TABLE test.t1;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 create table t1 (a int, unique(a)) engine=ndbcluster;
 create table t2 (a int, unique(a)) engine=innodb;
 begin;
@@ -101,3 +97,4 @@ select count(*) from t2;
 count(*)
 0
 drop table t1,t2;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_eng_trans.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_eng_trans.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_eng_trans.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 CREATE TABLE tmyisam (a int) ENGINE = MYISAM;
 CREATE TABLE tinnodb (a int) ENGINE = INNODB;
 CREATE TABLE tndb (a int) ENGINE = NDB;
@@ -477,10 +473,11 @@ a
 151
 152
 [on slave]
-Comparing tables master:test.tmyisam and slave:test.tmyisam
-Comparing tables master:test.tinnodb and slave:test.tinnodb
-Comparing tables master:test.tndb and slave:test.tndb
+include/diff_tables.inc [master:tmyisam, slave:tmyisam]
+include/diff_tables.inc [master:tinnodb, slave:tinnodb]
+include/diff_tables.inc [master:tndb, slave:tndb]
 ==== Clean up ====
 [on master]
 DROP TABLE tmyisam, tinnodb, tndb;
 [on slave]
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result	2011-04-15 11:41:33 +0000
@@ -1,10 +1,6 @@
 ==== Initialization ====
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 ---- setup master ----
 CREATE TABLE myisam_innodb (a INT) ENGINE=MYISAM;
 CREATE TABLE innodb_myisam (a INT) ENGINE=INNODB;
@@ -274,13 +270,14 @@ a
 34
 57
 58
-Comparing tables master:test.myisam_innodb and slave:test.myisam_innodb
-Comparing tables master:test.innodb_myisam and slave:test.innodb_myisam
-Comparing tables master:test.myisam_ndb and slave:test.myisam_ndb
-Comparing tables master:test.ndb_myisam and slave:test.ndb_myisam
-Comparing tables master:test.innodb_ndb and slave:test.innodb_ndb
-Comparing tables master:test.ndb_innodb and slave:test.ndb_innodb
+include/diff_tables.inc [master:myisam_innodb, slave:myisam_innodb]
+include/diff_tables.inc [master:innodb_myisam, slave:innodb_myisam]
+include/diff_tables.inc [master:myisam_ndb, slave:myisam_ndb]
+include/diff_tables.inc [master:ndb_myisam, slave:ndb_myisam]
+include/diff_tables.inc [master:innodb_ndb, slave:innodb_ndb]
+include/diff_tables.inc [master:ndb_innodb, slave:ndb_innodb]
 ==== Clean up ====
 drop table myisam_innodb, innodb_myisam;
 drop table myisam_ndb, ndb_myisam;
 drop table innodb_ndb, ndb_innodb;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 drop table if exists t1,t2;
 CREATE TABLE t1 (
 a int unsigned not null auto_increment primary key,
@@ -53,3 +49,4 @@ select * from t1;
 a
 3
 drop table t1;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 
 -------- Test for BUG#9361 --------
 CREATE TABLE t1 (
@@ -195,3 +191,4 @@ idpro	price	nbprice
 2	1.0000	2
 3	2.0000	1
 DROP TABLE t1, t2;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 DROP DATABASE IF EXISTS replica;
 CREATE DATABASE replica;
 CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
@@ -52,3 +48,4 @@ Tables_in_test
 USE test;
 DROP TABLE t1, t2;
 DROP DATABASE IF EXISTS replica;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 CREATE TABLE t1 (word CHAR(20) NOT NULL);
 LOAD DATA INFILE 'LOAD_FILE' INTO TABLE t1;
 LOAD DATA INFILE 'LOAD_FILE' INTO TABLE t1;
@@ -53,3 +49,4 @@ SELECT n FROM t1;
 n
 3456
 DROP TABLE t1;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;
 DROP TABLE IF EXISTS test.t1;
@@ -47,3 +43,4 @@ a
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;
 DROP TABLE IF EXISTS test.t1;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP PROCEDURE IF EXISTS p1;
@@ -42,3 +38,5 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
+include/rpl_end.inc
+

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 SET binlog_format = STATEMENT;
 
 *** Test 1 ***
@@ -123,12 +119,7 @@ master-bin.000002	#	Xid	1	<end_pos>	COMM
 
 ** Test 4 **
 
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/rpl_reset.inc
 
 select @log_name:=log_name, @start_pos:=start_pos, @end_pos:=end_pos
 from mysql.ndb_apply_status;
@@ -142,3 +133,4 @@ master-bin.000001	#	Xid	1	<end_pos>	COMM
 *** DUMP MASTER & SLAVE FOR COMPARE ********
 DROP DATABASE tpcb;
 ****** Do dumps compare ************
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 DROP TRIGGER test.t1_bi_t2;
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
@@ -28,3 +24,4 @@ n	f
 DROP TRIGGER test.t1_bi_t2;
 DROP TABLE test.t1;
 DROP TABLE test.t2;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result	2011-04-14 15:40:04 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result	2011-04-15 11:41:33 +0000
@@ -1,9 +1,5 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
+include/master-slave.inc
+[connection master]
 **** On Master ****
 CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
 INSERT INTO t1 VALUES (1,1), (2,2);
@@ -87,3 +83,4 @@ master-bin.000001	#	Write_rows	#	#	table
 master-bin.000001	#	Delete_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t1
+include/rpl_end.inc

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110415114133-0nkr7ylj8io26bm3.bundle
Thread
bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3288) Magnus Blåudd15 Apr