Merge.

knielsen · knielsen · commit 1e9ab68e4a59 · 2015-09-12T00:44:20.000+02:00
diff --git a/mysql-test/suite/rpl/t/rpl_mdev8193.test b/mysql-test/suite/rpl/t/rpl_mdev8193.test
@@ -38,10 +38,10 @@ eval start slave until master_log_file='$master_file', master_log_pos=$master_po
 
 --source include/wait_show_condition.inc
 
-if (`select COUNT(*) <> 11 from t1`) 
+if (`select COUNT(*) > 11 from t1`) 
 {
-	SELECT * FROM t1;
 	query_vertical show slave status;
+	SELECT * FROM t1;
 	die "Wrong number of rows in the table";
 }
 

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@ eval start slave until master_log_file='$master_file', master_log_pos=$master_po`
`38`	`38`
`39`	`39`	`--source include/wait_show_condition.inc`
`40`	`40`
`41`		-if (`select COUNT(*) <> 11 from t1`)
	`41`	+if (`select COUNT(*) > 11 from t1`)
`42`	`42`	`{`
`43`		`- SELECT * FROM t1;`
`44`	`43`	`query_vertical show slave status;`
	`44`	`+ SELECT * FROM t1;`
`45`	`45`	`die "Wrong number of rows in the table";`
`46`	`46`	`}`
`47`	`47`