← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

Finished store() cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
1053
1053
        session_info->command=(int) tmp->command;
1054
1054
        if ((mysys_var= tmp->mysys_var))
1055
1055
          pthread_mutex_lock(&mysys_var->mutex);
1056
 
        session_info->proc_info= (char*) (tmp->killed == Session::KILL_CONNECTION? "Killed" : 0);
 
1056
 
 
1057
        if (tmp->killed == Session::KILL_CONNECTION)
 
1058
          session_info->proc_info= (char*) "Killed";
 
1059
        else
 
1060
          session_info->proc_info= command_name[session_info->command].str;
 
1061
 
1057
1062
        session_info->state_info= (char*) (tmp->protocol->is_writing() ?
1058
1063
                                           "Writing to net" :
1059
1064
                                           tmp->protocol->is_reading() ?
1092
1097
    protocol->store(session_info->user, system_charset_info);
1093
1098
    protocol->store(session_info->host, system_charset_info);
1094
1099
    protocol->store(session_info->db, system_charset_info);
1095
 
    if (session_info->proc_info)
1096
 
      protocol->store(session_info->proc_info, system_charset_info);
1097
 
    else
1098
 
      protocol->store(command_name[session_info->command].str, system_charset_info);
 
1100
    protocol->store(session_info->proc_info, system_charset_info);
 
1101
 
1099
1102
    if (session_info->start_time)
1100
1103
      protocol->store((uint32_t) (now - session_info->start_time));
1101
1104
    else
1102
1105
      protocol->store();
 
1106
 
1103
1107
    protocol->store(session_info->state_info, system_charset_info);
1104
1108
    protocol->store(session_info->query, system_charset_info);
 
1109
 
1105
1110
    if (protocol->write())
1106
1111
      break; /* purecov: inspected */
1107
1112
  }