← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Brian Aker
  • Date: 2009-06-10 23:43:32 UTC
  • mfrom: (1054.2.25 mordred)
  • Revision ID: brian@gaz-20090610234332-o8zyo1lm2p6a2e7l
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
382
382
  protocol->prepareForResend();
383
383
  {
384
384
    if (table_list->schema_table)
385
 
      protocol->store(table_list->schema_table->table_name,
386
 
                      system_charset_info);
 
385
      protocol->store(table_list->schema_table->table_name);
387
386
    else
388
 
      protocol->store(table_list->table->alias, system_charset_info);
 
387
      protocol->store(table_list->table->alias);
389
388
  }
390
389
 
391
 
  protocol->store(buffer.ptr(), buffer.length(), buffer.charset());
 
390
  protocol->store(buffer.ptr(), buffer.length());
392
391
 
393
392
  if (protocol->write())
394
393
    return true;
423
422
    return true;
424
423
 
425
424
  protocol->prepareForResend();
426
 
  protocol->store(dbname, strlen(dbname), system_charset_info);
427
 
  protocol->store(buffer.ptr(), buffer.length(), buffer.charset());
 
425
  protocol->store(dbname, strlen(dbname));
 
426
  protocol->store(buffer.ptr(), buffer.length());
428
427
 
429
428
  if (protocol->write())
430
429
    return true;
1068
1067
  {
1069
1068
    protocol->prepareForResend();
1070
1069
    protocol->store((uint64_t) session_info->thread_id);
1071
 
    protocol->store(session_info->user, system_charset_info);
1072
 
    protocol->store(session_info->host, system_charset_info);
1073
 
    protocol->store(session_info->db, system_charset_info);
1074
 
    protocol->store(session_info->proc_info, system_charset_info);
 
1070
    protocol->store(session_info->user);
 
1071
    protocol->store(session_info->host);
 
1072
    protocol->store(session_info->db);
 
1073
    protocol->store(session_info->proc_info);
1075
1074
 
1076
1075
    if (session_info->start_time)
1077
1076
      protocol->store((uint32_t) (now - session_info->start_time));
1078
1077
    else
1079
1078
      protocol->store();
1080
1079
 
1081
 
    protocol->store(session_info->state_info, system_charset_info);
1082
 
    protocol->store(session_info->query, system_charset_info);
 
1080
    protocol->store(session_info->state_info);
 
1081
    protocol->store(session_info->query);
1083
1082
 
1084
1083
    if (protocol->write())
1085
1084
      break; /* purecov: inspected */