Merge pull request #10 from percona-ysorokin/ps-8.0-bug1680510-rpl_diff

Fix lp:1680510 (rpl_diff.inc in 5.7 does not compare data from different servers)
laurynas-biveinis · Apr 18, 2017 · 80c9a94 · 80c9a94
2 parents 8efcd47 + cc8b488
commit 80c9a94
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mysql-test/include/rpl_diff.inc b/mysql-test/include/rpl_diff.inc
@@ -113,7 +113,7 @@ while ($_rpl_diff_servers)
 
   # Execute statement
   --let $_rpl_diff_file= $MYSQLTEST_VARDIR/tmp/_rpl_diff_server-$_rpl_diff_server_i.tmp
-  --exec $MYSQL $_rpl_diff_database < $_rpl_diff_statement_file > $_rpl_diff_file
+  --exec $MYSQL --defaults-group-suffix=.$_rpl_diff_server_i $_rpl_diff_database < $_rpl_diff_statement_file > $_rpl_diff_file
 
   # Compare
   if (!$_rpl_diff_first)
@@ -129,7 +129,7 @@ while ($_rpl_diff_servers)
   --let $_rpl_diff_first= 0
 }
 --remove_file $_rpl_diff_prev_file
-
+--remove_file $_rpl_diff_statement_file
 
 --let $include_filename= rpl_diff.inc
 --source include/end_include_file.inc