← 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: Brian Aker
  • Date: 2010-07-08 01:02:22 UTC
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: brian@gaz-20100708010222-ed5eubeqorb9map2
Column support, clean up of IS/DD for NULL type.

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);
 
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
167
    add_field("TRX_QUERY");
168
168
  }
169
169
  else if (innobase_strcasecmp(table_name, "INNODB_LOCKS") == 0)
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)