← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/all_tables.h

  • Committer: Lee Bieber
  • Date: 2011-01-25 02:10:42 UTC
  • mfrom: (2109.1.4 build)
  • Revision ID: kalebral@gmail.com-20110125021042-ocqa0v509ae7fmtz
Need to add a "drop table a" in execute.wait test
Add execute test suite to regular test run
Merge Lee - fix second part of 705699, check for both client and server before building and testing rabbitmq plugin
Merge Shrews - Changes TransactionServices methods to use references to Session objects instead of pointers.

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;
32
33
 
33
34
  identifier::Table::vector table_names;
34
35
  identifier::Table::vector::const_iterator table_iterator;
49
50
    do {
50
51
      while (table_iterator != table_names.end())
51
52
      {
52
 
        message::table::shared_ptr table;
53
 
        table= plugin::StorageEngine::getTableMessage(session, *table_iterator);
 
53
        bool is_table_parsed= plugin::StorageEngine::getTableDefinition(session, *table_iterator, table);
54
54
        table_iterator++;
55
55
 
56
 
        if (table)
 
56
        if (is_table_parsed)
57
57
          return table;
58
58
      }
59
59
    } while ((schema_ptr= schema_generator) && table_setup());