← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/tables.cc

  • Committer: Lee Bieber
  • Date: 2010-11-07 19:34:48 UTC
  • mfrom: (1910.1.2 build)
  • Revision ID: kalebral@gmail.com-20101107193448-64kdu912qej354sh
Merge Stewart - including adapting and expanding the "differences from mysql" page from the wiki.
Merge Stewart - fix bug 668143: drizzleslap with --commit runs second iteration data load in a transaction

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, Inc.
 
4
 *  Copyright (C) 2010 Sun Microsystems
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::table::shared_ptr table_ptr;
 
71
  const drizzled::message::Table *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::identifier::Table::isView(getTableMessage().type()))
 
106
  if (drizzled::TableIdentifier::isView(getTableMessage().type()))
107
107
  {
108
108
    push("VIEW");
109
109
  }
133
133
  }
134
134
 
135
135
  /* ENGINE */
136
 
  const drizzled::message::Engine &engine= getTableMessage().engine();
137
 
  push(engine.name());
 
136
  push(getTableMessage().engine().name());
138
137
 
139
138
  /* ROW_FORMAT */
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");
 
139
  push("DEFAULT");
154
140
 
155
141
  /* TABLE_COLLATION */
156
142
  push(getTableMessage().options().collation());