← 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: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

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
 
60
63
  statement::Show *select= static_cast<statement::Show *>(getSession().lex->statement);
61
64
 
62
65
  if (not select->getShowTable().empty() && not select->getShowSchema().empty())
63
66
  {
64
67
    table_name.append(select->getShowTable().c_str());
65
 
    TableIdentifier identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
 
68
    identifier::Table identifier(select->getShowSchema().c_str(), select->getShowTable().c_str());
66
69
 
67
70
    is_tables_primed= plugin::StorageEngine::getTableDefinition(getSession(),
68
71
                                                                identifier,
144
147
  case message::Table::Field::DATE:
145
148
    push(DATE);
146
149
    break;
147
 
  case message::Table::Field::TIMESTAMP:
 
150
  case message::Table::Field::EPOCH:
148
151
    push(TIMESTAMP);
149
152
    break;
150
153
  case message::Table::Field::DATETIME:
163
166
  pushType(column.type(), column.string_options().collation());
164
167
 
165
168
  /* Null */
166
 
  push(column.constraints().is_nullable());
 
169
  push(not column.constraints().is_notnull());
167
170
 
168
171
  /* Default */
169
172
  if (column.options().has_default_value())