← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.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/show.cc
359
359
                                               cmax(buffer.length(),(uint32_t)1024)));
360
360
  }
361
361
 
362
 
  if (protocol->send_fields(&field_list,
363
 
                            Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
 
362
  if (protocol->sendFields(&field_list,
 
363
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
364
364
  {
365
365
    return(true);
366
366
  }
367
 
  protocol->prepare_for_resend();
 
367
  protocol->prepareForResend();
368
368
  {
369
369
    if (table_list->schema_table)
370
370
      protocol->store(table_list->schema_table->table_name,
403
403
  field_list.push_back(new Item_empty_string("Database",NAME_CHAR_LEN));
404
404
  field_list.push_back(new Item_empty_string("Create Database",1024));
405
405
 
406
 
  if (protocol->send_fields(&field_list,
407
 
                            Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
 
406
  if (protocol->sendFields(&field_list,
 
407
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
408
408
    return(true);
409
409
 
410
 
  protocol->prepare_for_resend();
 
410
  protocol->prepareForResend();
411
411
  protocol->store(dbname, strlen(dbname), system_charset_info);
412
412
  protocol->store(buffer.ptr(), buffer.length(), buffer.charset());
413
413
 
446
446
  }
447
447
  restore_record(table, s->default_values);              // Get empty record
448
448
  table->use_all_columns();
449
 
  if (session->protocol->send_fields(&field_list, Protocol::SEND_DEFAULTS))
 
449
  if (session->protocol->sendFields(&field_list, Protocol::SEND_DEFAULTS))
450
450
    return;
451
451
  session->my_eof();
452
452
  return;
1028
1028
  field->maybe_null= true;
1029
1029
  field_list.push_back(field=new Item_empty_string("Info", PROCESS_LIST_WIDTH));
1030
1030
  field->maybe_null= true;
1031
 
  if (protocol->send_fields(&field_list,
1032
 
                            Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
 
1031
  if (protocol->sendFields(&field_list,
 
1032
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
1033
1033
    return;
1034
1034
 
1035
1035
  pthread_mutex_lock(&LOCK_thread_count); // For unlink from list
1059
1059
        else
1060
1060
          session_info->proc_info= command_name[session_info->command].str;
1061
1061
 
1062
 
        session_info->state_info= (char*) (tmp->protocol->is_writing() ?
 
1062
        session_info->state_info= (char*) (tmp->protocol->isWriting() ?
1063
1063
                                           "Writing to net" :
1064
 
                                           tmp->protocol->is_reading() ?
 
1064
                                           tmp->protocol->isReading() ?
1065
1065
                                           (session_info->command == COM_SLEEP ?
1066
1066
                                            NULL : "Reading from net") :
1067
1067
                                       tmp->get_proc_info() ? tmp->get_proc_info() :
1092
1092
  time_t now= time(NULL);
1093
1093
  while ((session_info=thread_infos.get()))
1094
1094
  {
1095
 
    protocol->prepare_for_resend();
 
1095
    protocol->prepareForResend();
1096
1096
    protocol->store((uint64_t) session_info->thread_id);
1097
1097
    protocol->store(session_info->user, system_charset_info);
1098
1098
    protocol->store(session_info->host, system_charset_info);
1169
1169
      table->field[5]->store((uint32_t)(tmp->start_time ?
1170
1170
                                      now - tmp->start_time : 0), true);
1171
1171
      /* STATE */
1172
 
      val= (char*) (tmp->protocol->is_writing() ?
 
1172
      val= (char*) (tmp->protocol->isWriting() ?
1173
1173
                    "Writing to net" :
1174
 
                    tmp->protocol->is_reading() ?
 
1174
                    tmp->protocol->isReading() ?
1175
1175
                    (tmp->command == COM_SLEEP ?
1176
1176
                     NULL : "Reading from net") :
1177
1177
                    tmp->get_proc_info() ? tmp->get_proc_info() :