← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/all_tables.h

  • Committer: Barry.Leslie at PrimeBase
  • Date: 2011-02-21 16:33:37 UTC
  • mfrom: (2187 drizzle-build)
  • mto: (2228.1.4 build)
  • mto: This revision was merged to the branch mainline in revision 2230.
  • Revision ID: barry.leslie@primebase.com-20110221163337-cq8dq6u3ga9suxt7
Merged with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/all_tables.h
21
21
#ifndef DRIZZLED_GENERATOR_ALL_TABLES_H
22
22
#define DRIZZLED_GENERATOR_ALL_TABLES_H
23
23
 
24
 
#include "drizzled/plugin/storage_engine.h"
 
24
#include <drizzled/plugin/storage_engine.h>
25
25
 
26
26
namespace drizzled {
27
27
namespace generator {
29
29
class AllTables
30
30
{
31
31
  Session &session;
32
 
  message::table::shared_ptr table;
33
32
 
34
33
  identifier::Table::vector table_names;
35
34
  identifier::Table::vector::const_iterator table_iterator;
50
49
    do {
51
50
      while (table_iterator != table_names.end())
52
51
      {
53
 
        bool is_table_parsed= plugin::StorageEngine::getTableDefinition(session, *table_iterator, table);
 
52
        message::table::shared_ptr table;
 
53
        table= plugin::StorageEngine::getTableMessage(session, *table_iterator);
54
54
        table_iterator++;
55
55
 
56
 
        if (is_table_parsed)
 
56
        if (table)
57
57
          return table;
58
58
      }
59
59
    } while ((schema_ptr= schema_generator) && table_setup());