← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/data_dictionary.cc

  • Committer: Andrew Hutchings
  • Date: 2010-09-08 19:03:09 UTC
  • mfrom: (1750 staging)
  • mto: (1750.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1751.
  • Revision ID: andrew@linuxjedi.co.uk-20100908190309-mya1nu7xvo1fpvk8
Merge trunk into branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/data_dictionary.cc
164
164
    add_field("TRX_WAIT_STARTED", plugin::TableFunction::NUMBER, 0, false);
165
165
    add_field("TRX_WEIGHT", plugin::TableFunction::NUMBER, 0, false);
166
166
    add_field("TRX_DRIZZLE_THREAD_ID", plugin::TableFunction::NUMBER, 0, false);
167
 
    add_field("TRX_QUERY");
 
167
    add_field("TRX_QUERY", plugin::TableFunction::STRING, TRX_I_S_TRX_QUERY_MAX_LEN, true);
168
168
  }
169
169
  else if (innobase_strcasecmp(table_name, "INNODB_LOCKS") == 0)
170
170
  {
331
331
 
332
332
    push(static_cast<int64_t>(row->trx_weight));
333
333
    push(static_cast<uint64_t>(row->trx_mysql_thread_id));
334
 
    push(row->trx_query);
 
334
    if (row->trx_query)
 
335
    {
 
336
      push(row->trx_query);
 
337
    }
 
338
    else
 
339
    {
 
340
      push();
 
341
    }
335
342
}
336
343
 
337
344
void InnodbTrxTool::Generator::populate_innodb_lock_waits()