← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.cc

  • Committer: Brian Aker
  • Date: 2008-11-13 02:56:15 UTC
  • mfrom: (575.4.10 devel)
  • Revision ID: brian@tangent.org-20081113025615-snhsi52yb2ivmx6f
Merging Monty's code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
26
26
#include <drizzled/server_includes.h>
27
27
 
28
28
#include <storage/myisam/myisam.h>
29
 
#include <drizzled/rpl_mi.h>
30
 
#include <drizzled/rpl_rli.h>
31
 
#include <drizzled/sql_repl.h>
32
 
#include <drizzled/rpl_filter.h>
 
29
#include <drizzled/replication/mi.h>
 
30
#include <drizzled/replication/rli.h>
 
31
#include <drizzled/replication/replication.h>
 
32
#include <drizzled/replication/filter.h>
33
33
#include <mysys/thr_alarm.h>
34
34
#include <libdrizzle/errmsg.h>
35
35
#include <mysys/mysys_err.h>
51
51
 
52
52
#include <drizzled/tztime.h>
53
53
 
54
 
#include "rpl_tblmap.h"
 
54
#include <drizzled/replication/tblmap.h>
55
55
 
56
56
#define MAX_SLAVE_RETRY_PAUSE 5
57
57
bool use_slave_mask = 0;