← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Brian Aker
  • Date: 2009-04-13 16:22:40 UTC
  • mfrom: (971.1.78 mordred)
  • Revision ID: brian@gaz-20090413162240-ugi3gvhofmcuglzl
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
33
33
#include "drizzled/cost_vect.h"
34
34
#include "drizzled/session.h"
35
35
#include "drizzled/sql_base.h"
36
 
#include "drizzled/replicator.h"
 
36
#include "drizzled/transaction_services.h"
37
37
#include "drizzled/lock.h"
38
38
#include "drizzled/item/int.h"
39
39
#include "drizzled/item/empty_string.h"
40
40
#include "drizzled/unireg.h" // for mysql_frm_type
41
41
#include "drizzled/field/timestamp.h"
42
 
#include "drizzled/serialize/table.pb.h"
 
42
#include "drizzled/message/table.pb.h"
43
43
 
44
44
using namespace std;
45
45
 
 
46
extern drizzled::TransactionServices transaction_services;
 
47
 
46
48
KEY_CREATE_INFO default_key_create_info= { HA_KEY_ALG_UNDEF, 0, {NULL,0}, {NULL,0} };
47
49
 
48
50
/* number of entries in storage_engines[] */
3501
3503
                           const unsigned char *before_record,
3502
3504
                           const unsigned char *after_record)
3503
3505
{
3504
 
  bool error= false;
3505
3506
  Session *const session= table->in_use;
3506
3507
 
3507
 
  if (table->no_replicate == false)
3508
 
    return false;
3509
 
 
3510
 
  error= replicator_session_init(session);
3511
 
 
3512
3508
  switch (session->lex->sql_command)
3513
3509
  {
3514
3510
  case SQLCOM_REPLACE:
3516
3512
  case SQLCOM_REPLACE_SELECT:
3517
3513
  case SQLCOM_INSERT_SELECT:
3518
3514
  case SQLCOM_CREATE_TABLE:
3519
 
    error= replicator_write_row(session, table);
 
3515
    transaction_services.insertRecord(session, table);
3520
3516
    break;
3521
3517
 
3522
3518
  case SQLCOM_UPDATE:
3523
3519
  case SQLCOM_UPDATE_MULTI:
3524
 
    error= replicator_update_row(session, table, before_record, after_record);
 
3520
    transaction_services.updateRecord(session, table, before_record, after_record);
3525
3521
    break;
3526
3522
 
3527
3523
  case SQLCOM_DELETE:
3528
3524
  case SQLCOM_DELETE_MULTI:
3529
 
    error= replicator_delete_row(session, table);
 
3525
    transaction_services.deleteRecord(session, table);
3530
3526
    break;
3531
3527
 
3532
3528
    /*
3536
3532
    break;
3537
3533
  }
3538
3534
 
3539
 
  return error;
 
3535
  return false; //error;
3540
3536
}
3541
3537
 
3542
3538
int handler::ha_external_lock(Session *session, int lock_type)
3566
3562
*/
3567
3563
int handler::ha_reset()
3568
3564
{
3569
 
  /* Check that we have called all proper deallocation functions */
3570
 
  assert((unsigned char*) table->def_read_set.bitmap +
3571
 
              table->s->column_bitmap_size ==
3572
 
              (unsigned char*) table->def_write_set.bitmap);
3573
 
  assert(bitmap_is_set_all(&table->s->all_set));
 
3565
  assert(table->s->all_set.size() == table->s->all_set.count());
3574
3566
  assert(table->key_read == 0);
3575
3567
  /* ensure that ha_index_end / ha_rnd_end has been called */
3576
3568
  assert(inited == NONE);