← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

  • Committer: Brian Aker
  • Date: 2009-07-29 18:35:48 UTC
  • mfrom: (1101.1.12 merge)
  • Revision ID: brian@gaz-20090729183548-yp36iwoaemfc76z0
Merging Monty (which includes new replication)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
33
33
#include <drizzled/sql_base.h>
34
34
#include <drizzled/lock.h>
35
35
#include <drizzled/errmsg_print.h>
36
 
#include <drizzled/transaction_services.h>
 
36
#include <drizzled/replication_services.h>
37
37
#include <drizzled/message/schema.pb.h>
38
38
 
39
 
extern drizzled::TransactionServices transaction_services;
 
39
extern drizzled::ReplicationServices replication_services;
40
40
 
41
41
#define MY_DB_OPT_FILE "db.opt"
42
42
#define MAX_DROP_TABLE_Q_LEN      1024
260
260
  else if (error_erno)
261
261
    error= true;
262
262
 
263
 
  transaction_services.rawStatement(session, session->query, session->query_length);
 
263
  replication_services.rawStatement(session, session->query, session->query_length);
264
264
  session->my_ok(result);
265
265
 
266
266
exit:
309
309
    goto exit;
310
310
  }
311
311
 
312
 
  transaction_services.rawStatement(session, session->getQueryString(), session->getQueryLength());
 
312
  replication_services.rawStatement(session, session->getQueryString(), session->getQueryLength());
313
313
  session->my_ok(result);
314
314
 
315
315
  pthread_mutex_unlock(&LOCK_create_db);
418
418
      query= session->query;
419
419
      query_length= session->query_length;
420
420
    }
421
 
    transaction_services.rawStatement(session, session->getQueryString(), session->getQueryLength());
 
421
    replication_services.rawStatement(session, session->getQueryString(), session->getQueryLength());
422
422
    session->clear_error();
423
423
    session->server_status|= SERVER_STATUS_DB_DROPPED;
424
424
    session->my_ok((uint32_t) deleted);
445
445
      if (query_pos + tbl_name_len + 1 >= query_end)
446
446
      {
447
447
        /* These DDL methods and logging protected with LOCK_create_db */
448
 
        transaction_services.rawStatement(session, query, (size_t) (query_pos -1 - query));
 
448
        replication_services.rawStatement(session, query, (size_t) (query_pos -1 - query));
449
449
        query_pos= query_data_start;
450
450
      }
451
451
 
458
458
    if (query_pos != query_data_start)
459
459
    {
460
460
      /* These DDL methods and logging protected with LOCK_create_db */
461
 
      transaction_services.rawStatement(session, query, (size_t) (query_pos -1 - query));
 
461
      replication_services.rawStatement(session, query, (size_t) (query_pos -1 - query));
462
462
    }
463
463
  }
464
464