← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

Finished first pass at Protocol cleanup, still some things to remove but they are a bit more involved.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
1067
1067
  field_list.push_back(new Item_int("bqual_length", 0, MY_INT32_NUM_DECIMAL_DIGITS));
1068
1068
  field_list.push_back(new Item_empty_string("data",XIDDATASIZE));
1069
1069
 
1070
 
  if (protocol->send_fields(&field_list,
1071
 
                            Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
 
1070
  if (protocol->sendFields(&field_list,
 
1071
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
1072
1072
    return(1);
1073
1073
 
1074
1074
  pthread_mutex_lock(&LOCK_xid_cache);
1076
1076
  {
1077
1077
    if (xs->xa_state==XA_PREPARED)
1078
1078
    {
1079
 
      protocol->prepare_for_resend();
 
1079
      protocol->prepareForResend();
1080
1080
      protocol->store((int64_t)xs->xid.formatID);
1081
1081
      protocol->store((int64_t)xs->xid.gtrid_length);
1082
1082
      protocol->store((int64_t)xs->xid.bqual_length);
4143
4143
                       const char *status, uint32_t status_len)
4144
4144
{
4145
4145
  Protocol *protocol= session->protocol;
4146
 
  protocol->prepare_for_resend();
 
4146
  protocol->prepareForResend();
4147
4147
  protocol->store(type, type_len, system_charset_info);
4148
4148
  protocol->store(file, file_len, system_charset_info);
4149
4149
  protocol->store(status, status_len, system_charset_info);
4162
4162
  field_list.push_back(new Item_empty_string("Name",FN_REFLEN));
4163
4163
  field_list.push_back(new Item_empty_string("Status",10));
4164
4164
 
4165
 
  if (protocol->send_fields(&field_list,
4166
 
                            Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
 
4165
  if (protocol->sendFields(&field_list,
 
4166
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
4167
4167
    return true;
4168
4168
 
4169
4169
  result= engine->show_status(session, stat_print, stat) ? 1 : 0;