← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_columns.cc

  • Committer: Monty Taylor
  • Date: 2010-12-26 03:15:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226031544-1cf3raipu53fnmyj
Through page.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/show_dictionary/show_columns.cc
57
57
  is_columns_primed(false),
58
58
  column_iterator(0)
59
59
{
60
 
  if (not isShowQuery())
61
 
   return;
62
 
 
63
60
  statement::Show *select= static_cast<statement::Show *>(getSession().lex->statement);
64
61
 
65
62
  if (not select->getShowTable().empty() && not select->getShowSchema().empty())
66
63
  {
67
64
    table_name.append(select->getShowTable().c_str());
68
 
    identifier::Table identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
 
65
    TableIdentifier identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
69
66
 
70
67
    is_tables_primed= plugin::StorageEngine::getTableDefinition(getSession(),
71
68
                                                                identifier,
166
163
  pushType(column.type(), column.string_options().collation());
167
164
 
168
165
  /* Null */
169
 
  push(not column.constraints().is_notnull());
 
166
  push(column.constraints().is_nullable());
170
167
 
171
168
  /* Default */
172
169
  if (column.options().has_default_value())