← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.cc

  • Committer: Brian Aker
  • Date: 2010-04-06 06:50:19 UTC
  • mfrom: (1405.3.9 replication-api)
  • Revision ID: brian@gaz-20100406065019-n387mztxp1i75qel
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cursor.cc
36
36
#include "drizzled/session.h"
37
37
#include "drizzled/sql_base.h"
38
38
#include "drizzled/transaction_services.h"
39
 
#include "drizzled/replication_services.h"
40
39
#include "drizzled/lock.h"
41
40
#include "drizzled/item/int.h"
42
41
#include "drizzled/item/empty_string.h"
44
43
#include "drizzled/message/table.pb.h"
45
44
#include "drizzled/plugin/client.h"
46
45
#include "drizzled/internal/my_sys.h"
47
 
#include "drizzled/transaction_services.h"
48
46
 
49
47
using namespace std;
50
48
 
1297
1295
                                    const unsigned char *after_record)
1298
1296
{
1299
1297
  TransactionServices &transaction_services= TransactionServices::singleton();
1300
 
  ReplicationServices &replication_services= ReplicationServices::singleton();
1301
1298
  Session *const session= table->in_use;
1302
1299
 
1303
 
  if (table->s->tmp_table || not replication_services.isActive())
 
1300
  if (table->s->tmp_table || not transaction_services.shouldConstructMessages())
1304
1301
    return false;
1305
1302
 
1306
1303
  bool result= false;