← 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: 2010-02-22 19:23:48 UTC
  • mfrom: (1273.13.95 build)
  • Revision ID: brian@gaz-20100222192348-bcda6uwqmyt30rbi
Merge Padraig.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
288
288
  else if (error_erno)
289
289
    error= true;
290
290
 
291
 
  replication_services.rawStatement(session, session->query, session->query_length);
 
291
  replication_services.rawStatement(session, session->query);
292
292
  session->my_ok(result);
293
293
 
294
294
exit:
342
342
    goto exit;
343
343
  }
344
344
 
345
 
  replication_services.rawStatement(session, session->getQueryString(), session->getQueryLength());
 
345
  replication_services.rawStatement(session, session->getQueryString());
346
346
  session->my_ok(result);
347
347
 
348
348
  pthread_mutex_unlock(&LOCK_create_db);
441
441
  }
442
442
  if (deleted >= 0)
443
443
  {
444
 
    const char *query;
445
 
    uint32_t query_length;
446
 
 
447
 
    assert(session->query);
448
 
 
449
 
    query= session->query;
450
 
    query_length= session->query_length;
 
444
    assert(! session->query.empty());
451
445
 
452
446
    ReplicationServices &replication_services= ReplicationServices::singleton();
453
 
    replication_services.rawStatement(session, session->getQueryString(), session->getQueryLength());
 
447
    replication_services.rawStatement(session, session->getQueryString());
454
448
    session->clear_error();
455
449
    session->server_status|= SERVER_STATUS_DB_DROPPED;
456
450
    session->my_ok((uint32_t) deleted);
478
472
      if (query_pos + tbl_name_len + 1 >= query_end)
479
473
      {
480
474
        /* These DDL methods and logging protected with LOCK_create_db */
481
 
        replication_services.rawStatement(session, query, (size_t) (query_pos -1 - query));
 
475
        replication_services.rawStatement(session, query);
482
476
        query_pos= query_data_start;
483
477
      }
484
478
 
491
485
    if (query_pos != query_data_start)
492
486
    {
493
487
      /* These DDL methods and logging protected with LOCK_create_db */
494
 
      replication_services.rawStatement(session, query, (size_t) (query_pos -1 - query));
 
488
      replication_services.rawStatement(session, query);
495
489
    }
496
490
  }
497
491