Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570


mysql-test/suite/rpl/t/rpl_sp.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Use local.  Needs re-recording.

mysql-test/suite/rpl/t/rpl_sp.test

@@ -608,8 +608,13 @@ use test|
 
 delimiter ;|
 
+--replace_column 5 t 6 t
+show procedure status like '%mysqltestbug36570%';
+show create procedure ` mysqltestbug36570_p2`;
+
 sync_slave_with_master;
 connection slave;
+
 --replace_column 5 t 6 t
 show procedure status like '%mysqltestbug36570%';
 show create procedure ` mysqltestbug36570_p2`;