← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/replication_services.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/replication_services.cc
97
97
    return false;
98
98
  }
99
99
 
100
 
  for (Appliers::iterator appl_iter= appliers.begin();
101
 
       appl_iter != appliers.end();
102
 
       ++appl_iter)
 
100
  BOOST_FOREACH(Appliers::reference appl_iter, appliers)
103
101
  {
104
 
    plugin::TransactionApplier *applier= (*appl_iter).second;
105
 
    string requested_replicator_name= (*appl_iter).first;
 
102
    plugin::TransactionApplier *applier= appl_iter.second;
 
103
    string requested_replicator_name= appl_iter.first;
106
104
    normalizeReplicatorName(requested_replicator_name);
107
105
 
108
106
    bool found= false;
109
107
    Replicators::iterator repl_iter;
110
 
    for (repl_iter= replicators.begin();
111
 
         repl_iter != replicators.end();
112
 
         ++repl_iter)
 
108
    for (repl_iter= replicators.begin(); repl_iter != replicators.end(); ++repl_iter)
113
109
    {
114
110
      string replicator_name= (*repl_iter)->getName();
115
111
      normalizeReplicatorName(replicator_name);
170
166
{
171
167
  plugin::ReplicationReturnCode result= plugin::SUCCESS;
172
168
 
173
 
  for (ReplicationStreams::iterator iter= replication_streams.begin();
174
 
       iter != replication_streams.end();
175
 
       ++iter)
 
169
  BOOST_FOREACH(ReplicationStreams::reference iter, replication_streams)
176
170
  {
177
 
    plugin::TransactionReplicator *cur_repl= iter->first;
178
 
    plugin::TransactionApplier *cur_appl= iter->second;
 
171
    plugin::TransactionReplicator *cur_repl= iter.first;
 
172
    plugin::TransactionApplier *cur_appl= iter.second;
179
173
 
180
174
    result= cur_repl->replicate(cur_appl, in_session, to_push);
181
175