bad merge fixed

989721d1 · serg@serg.mylan · 1a321579 · 989721d1
Commit 989721d1 authored Nov 28, 2004 by serg@serg.mylan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/rpl_start_stop_slave.result mysql-test/r/rpl_start_stop_slave.result +2 -2

No files found.
--- a/mysql-test/r/rpl_start_stop_slave.result
+++ b/mysql-test/r/rpl_start_stop_slave.result
-slave stop;
+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;
-slave start;
+start slave;
 stop slave;
 create table t1(n int);
 start slave;