← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/all_tables.h

  • Committer: Brian Aker
  • Date: 2010-11-10 05:50:26 UTC
  • mfrom: (1910.2.15 merge)
  • mto: This revision was merged to the branch mainline in revision 1922.
  • Revision ID: brian@tangent.org-20101110055026-shjlsd5jeumje2vt
Merge in tree for shared_ptr work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/all_tables.h
29
29
class AllTables
30
30
{
31
31
  Session &session;
32
 
  message::Table table;
 
32
  message::TablePtr table;
33
33
 
34
34
  TableIdentifiers table_names;
35
35
  TableIdentifiers::const_iterator table_iterator;
45
45
 
46
46
  void reset();
47
47
 
48
 
  operator const drizzled::message::Table*()
 
48
  operator const drizzled::message::TablePtr()
49
49
  {
50
50
    do {
51
51
      while (table_iterator != table_names.end())
52
52
      {
53
 
        table.Clear();
54
53
        bool is_table_parsed= plugin::StorageEngine::getTableDefinition(session, *table_iterator, table);
55
54
        table_iterator++;
56
55
 
57
56
        if (is_table_parsed)
58
 
          return &table;
 
57
          return table;
59
58
      }
60
59
    } while ((schema_ptr= schema_generator) && table_setup());
61
60
 
62
 
    return NULL;
 
61
    return message::TablePtr();
63
62
  }
64
63
 
65
64
  operator const drizzled::TableIdentifier*()