From e52e3167c79d874628c47a50d8c8e0210a263085 Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Fri, 29 Sep 2000 17:20:26 -0600
Subject: bug fixes in server-id, moved replication functionality to sql_repl.*
 will push this one, since the replication code now works

repl-tests/test-dump/run.test:
  added slave/master reset
sql/Makefile.am:
  added sql_repl.*
sql/log_event.cc:
  moved #defines to log_event.h
sql/log_event.h:
  moved #defines from log_event.cc
sql/mysql_priv.h:
  added LOCK_server_id
sql/mysqlbinlog.cc:
  added server id
sql/mysqld.cc:
  added mutex_init for LOCK_server_id
sql/slave.cc:
  added server_id to COM_BINLOG_DUMP
sql/sql_base.cc:
  moved replication code to sql_repl.*
sql/sql_parse.cc:
  moved replication code to sql_repl.*
---
 repl-tests/test-dump/run.test | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'repl-tests')

diff --git a/repl-tests/test-dump/run.test b/repl-tests/test-dump/run.test
index 612db3fc6cf..22fa37e5ffd 100644
--- a/repl-tests/test-dump/run.test
+++ b/repl-tests/test-dump/run.test
@@ -1,4 +1,11 @@
 source ../include/master-slave.inc;
+connection slave;
+!slave stop;
+flush slave;
+connection master;
+flush master;
+connection slave;
+slave start;
 connection master;
 use test;
 drop table if exists words;
@@ -7,6 +14,7 @@ load data infile '/usr/dict/words' into table words;
 drop table if exists words1;
 create table words1 (word char(20) not null);
 load data infile '/usr/dict/words' into table words1;
+sleep 5;
 connection slave;
 use test;
 drop table if exists words;
-- 
cgit v1.2.1