← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/data_dictionary.cc
42
42
  plugin::TableFunction("DATA_DICTIONARY", in_reset ? "INNODB_CMP_RESET" : "INNODB_CMP"),
43
43
  outer_reset(in_reset)
44
44
{
45
 
  add_field("PAGE_SIZE", plugin::TableFunction::NUMBER);
46
 
  add_field("COMPRESS_OPS", plugin::TableFunction::NUMBER);
47
 
  add_field("COMPRESS_OPS_OK", plugin::TableFunction::NUMBER);
48
 
  add_field("COMPRESS_TIME", plugin::TableFunction::NUMBER);
49
 
  add_field("UNCOMPRESS_OPS", plugin::TableFunction::NUMBER);
50
 
  add_field("UNCOMPRESS_TIME", plugin::TableFunction::NUMBER);
 
45
  add_field("PAGE_SIZE", plugin::TableFunction::NUMBER, 0, false);
 
46
  add_field("COMPRESS_OPS", plugin::TableFunction::NUMBER, 0, false);
 
47
  add_field("COMPRESS_OPS_OK", plugin::TableFunction::NUMBER, 0, false);
 
48
  add_field("COMPRESS_TIME", plugin::TableFunction::NUMBER, 0, false);
 
49
  add_field("UNCOMPRESS_OPS", plugin::TableFunction::NUMBER, 0, false);
 
50
  add_field("UNCOMPRESS_TIME", plugin::TableFunction::NUMBER, 0, false);
51
51
}
52
52
 
53
53
CmpTool::Generator::Generator(Field **arg, bool in_reset) :
98
98
  plugin::TableFunction("DATA_DICTIONARY", in_reset ? "INNODB_CMPMEM_RESET" : "INNODB_CMPMEM"),
99
99
  outer_reset(in_reset)
100
100
{
101
 
  add_field("PAGE_SIZE", plugin::TableFunction::NUMBER);
102
 
  add_field("PAGES_USED", plugin::TableFunction::NUMBER);
103
 
  add_field("PAGES_FREE", plugin::TableFunction::NUMBER);
104
 
  add_field("RELOCATION_OPS", plugin::TableFunction::NUMBER);
105
 
  add_field("RELOCATION_TIME", plugin::TableFunction::NUMBER);
 
101
  add_field("PAGE_SIZE", plugin::TableFunction::NUMBER, 0, false);
 
102
  add_field("PAGES_USED", plugin::TableFunction::NUMBER, 0, false);
 
103
  add_field("PAGES_FREE", plugin::TableFunction::NUMBER, 0, false);
 
104
  add_field("RELOCATION_OPS", plugin::TableFunction::NUMBER, 0, false);
 
105
  add_field("RELOCATION_TIME", plugin::TableFunction::NUMBER, 0, false);
106
106
}
107
107
 
108
108
CmpmemTool::Generator::Generator(Field **arg, bool in_reset) :
159
159
  {
160
160
    add_field("TRX_ID");
161
161
    add_field("TRX_STATE");
162
 
    add_field("TRX_STARTED", plugin::TableFunction::NUMBER);
 
162
    add_field("TRX_STARTED", plugin::TableFunction::NUMBER, 0, false);
163
163
    add_field("TRX_REQUESTED_LOCK_ID");
164
 
    add_field("TRX_WAIT_STARTED", plugin::TableFunction::NUMBER);
165
 
    add_field("TRX_WEIGHT", plugin::TableFunction::NUMBER);
166
 
    add_field("TRX_DRIZZLE_THREAD_ID", plugin::TableFunction::NUMBER);
167
 
    add_field("TRX_QUERY");
 
164
    add_field("TRX_WAIT_STARTED", plugin::TableFunction::NUMBER, 0, false);
 
165
    add_field("TRX_WEIGHT", plugin::TableFunction::NUMBER, 0, false);
 
166
    add_field("TRX_DRIZZLE_THREAD_ID", plugin::TableFunction::NUMBER, 0, false);
 
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
  {
174
174
    add_field("LOCK_TYPE");
175
175
    add_field("LOCK_TABLE");
176
176
    add_field("LOCK_INDEX");
177
 
    add_field("LOCK_SPACE", plugin::TableFunction::NUMBER);
178
 
    add_field("LOCK_PAGE", plugin::TableFunction::NUMBER);
179
 
    add_field("LOCK_REC", plugin::TableFunction::NUMBER);
 
177
    add_field("LOCK_SPACE", plugin::TableFunction::NUMBER, 0, false);
 
178
    add_field("LOCK_PAGE", plugin::TableFunction::NUMBER, 0, false);
 
179
    add_field("LOCK_REC", plugin::TableFunction::NUMBER, 0, false);
180
180
    add_field("LOCK_DATA");
181
181
  }
182
182
  else if (innobase_strcasecmp(table_name, "INNODB_LOCK_WAITS") == 0)
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()