← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/tables.cc

  • Committer: Andrew Hutchings
  • Date: 2011-01-14 15:36:01 UTC
  • mto: (2085.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2086.
  • Revision ID: andrew@linuxjedi.co.uk-20110114153601-levd2rzn0h31wbxc
https://launchpad.net/bugs/702881
If ROW_FORMAT was specified then actually show it in data_dictionary.tables

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/tables.cc
133
133
  }
134
134
 
135
135
  /* ENGINE */
136
 
  push(getTableMessage().engine().name());
 
136
  const drizzled::message::Engine &engine= getTableMessage().engine();
 
137
  push(engine.name());
137
138
 
138
139
  /* ROW_FORMAT */
139
 
  push("DEFAULT");
 
140
  bool row_format_sent= false;
 
141
  for (ssize_t it= 0; it < engine.options_size(); it++)
 
142
  {
 
143
    const drizzled::message::Engine::Option &opt= engine.options(it);
 
144
    if (opt.name().compare("ROW_FORMAT") == 0)
 
145
    {
 
146
      row_format_sent= true;
 
147
      push(opt.state());
 
148
      break;
 
149
    }
 
150
  }
 
151
 
 
152
  if (not row_format_sent)
 
153
    push("DEFAULT");
140
154
 
141
155
  /* TABLE_COLLATION */
142
156
  push(getTableMessage().options().collation());