← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Monty Taylor
  • Date: 2009-04-09 05:35:58 UTC
  • mfrom: (984 merge)
  • mto: (992.1.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 986.
  • Revision ID: mordred@inaugust.com-20090409053558-qi1x0zzsgf1d8f1p
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
844
844
  field_list.push_back(new Item_int("bqual_length", 0, MY_INT32_NUM_DECIMAL_DIGITS));
845
845
  field_list.push_back(new Item_empty_string("data",XIDDATASIZE));
846
846
 
847
 
  if (protocol->send_fields(&field_list,
848
 
                            Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
 
847
  if (protocol->sendFields(&field_list,
 
848
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
849
849
    return(1);
850
850
 
851
851
  pthread_mutex_lock(&LOCK_xid_cache);
853
853
  {
854
854
    if (xs->xa_state==XA_PREPARED)
855
855
    {
856
 
      protocol->prepare_for_resend();
857
 
      protocol->store_int64_t((int64_t)xs->xid.formatID, false);
858
 
      protocol->store_int64_t((int64_t)xs->xid.gtrid_length, false);
859
 
      protocol->store_int64_t((int64_t)xs->xid.bqual_length, false);
 
856
      protocol->prepareForResend();
 
857
      protocol->store((int64_t)xs->xid.formatID);
 
858
      protocol->store((int64_t)xs->xid.gtrid_length);
 
859
      protocol->store((int64_t)xs->xid.bqual_length);
860
860
      protocol->store(xs->xid.data, xs->xid.gtrid_length+xs->xid.bqual_length,
861
861
                      &my_charset_bin);
862
862
      if (protocol->write())
3454
3454
                       const char *status, uint32_t status_len)
3455
3455
{
3456
3456
  Protocol *protocol= session->protocol;
3457
 
  protocol->prepare_for_resend();
 
3457
  protocol->prepareForResend();
3458
3458
  protocol->store(type, type_len, system_charset_info);
3459
3459
  protocol->store(file, file_len, system_charset_info);
3460
3460
  protocol->store(status, status_len, system_charset_info);
3473
3473
  field_list.push_back(new Item_empty_string("Name",FN_REFLEN));
3474
3474
  field_list.push_back(new Item_empty_string("Status",10));
3475
3475
 
3476
 
  if (protocol->send_fields(&field_list,
3477
 
                            Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
 
3476
  if (protocol->sendFields(&field_list,
 
3477
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
3478
3478
    return true;
3479
3479
 
3480
3480
  result= engine->show_status(session, stat_print, stat) ? 1 : 0;