← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

Merged Eric from lp:~eday/drizzle/eday-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
799
799
bool mysql_xa_recover(Session *session)
800
800
{
801
801
  List<Item> field_list;
802
 
  Protocol *protocol= session->protocol;
 
802
  drizzled::plugin::Protocol *protocol= session->protocol;
803
803
  int i=0;
804
804
  XID_STATE *xs;
805
805
 
808
808
  field_list.push_back(new Item_int("bqual_length", 0, MY_INT32_NUM_DECIMAL_DIGITS));
809
809
  field_list.push_back(new Item_empty_string("data",XIDDATASIZE));
810
810
 
811
 
  if (protocol->sendFields(&field_list,
812
 
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
 
811
  if (protocol->sendFields(&field_list))
813
812
    return 1;
814
813
 
815
814
  pthread_mutex_lock(&LOCK_xid_cache);
2627
2626
                       const char *file, uint32_t file_len,
2628
2627
                       const char *status, uint32_t status_len)
2629
2628
{
2630
 
  Protocol *protocol= session->protocol;
 
2629
  drizzled::plugin::Protocol *protocol= session->protocol;
2631
2630
  protocol->prepareForResend();
2632
2631
  protocol->store(type, type_len);
2633
2632
  protocol->store(file, file_len);
2640
2639
bool ha_show_status(Session *session, StorageEngine *engine, enum ha_stat_type stat)
2641
2640
{
2642
2641
  List<Item> field_list;
2643
 
  Protocol *protocol= session->protocol;
 
2642
  drizzled::plugin::Protocol *protocol= session->protocol;
2644
2643
  bool result;
2645
2644
 
2646
2645
  field_list.push_back(new Item_empty_string("Type",10));
2647
2646
  field_list.push_back(new Item_empty_string("Name",FN_REFLEN));
2648
2647
  field_list.push_back(new Item_empty_string("Status",10));
2649
2648
 
2650
 
  if (protocol->sendFields(&field_list,
2651
 
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
 
2649
  if (protocol->sendFields(&field_list))
2652
2650
    return true;
2653
2651
 
2654
2652
  result= engine->show_status(session, stat_print, stat) ? 1 : 0;