← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/tables.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/schema_dictionary/tables.cc
1
1
/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2010 Sun Microsystems
 
4
 *  Copyright (C) 2010 Sun Microsystems, Inc.
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
68
68
 
69
69
bool TablesTool::Generator::nextTable()
70
70
{
71
 
  drizzled::message::TablePtr table_ptr;
 
71
  drizzled::message::table::shared_ptr table_ptr;
72
72
  while ((table_ptr= all_tables_generator))
73
73
  {
74
74
    table_message.CopyFrom(*table_ptr);
103
103
  push(getTableMessage().name());
104
104
 
105
105
  /* TABLE_TYPE */
106
 
  if (drizzled::TableIdentifier::isView(getTableMessage().type()))
 
106
  if (drizzled::identifier::Table::isView(getTableMessage().type()))
107
107
  {
108
108
    push("VIEW");
109
109
  }
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());