← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/all_tables.h

  • Committer: Andrew Hutchings
  • Date: 2010-12-15 18:59:55 UTC
  • mto: This revision was merged to the branch mainline in revision 2006.
  • Revision ID: andrew@linuxjedi.co.uk-20101215185955-q12lkja8hdnpjqg7
Make the test look for drizzleadmin failure instead of success as this test is not possible to fix for success on our FreeBSD 8.0 box

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/all_tables.h
31
31
  Session &session;
32
32
  message::table::shared_ptr table;
33
33
 
34
 
  identifier::Table::vector table_names;
35
 
  identifier::Table::vector::const_iterator table_iterator;
 
34
  TableIdentifier::vector table_names;
 
35
  TableIdentifier::vector::const_iterator table_iterator;
36
36
 
37
37
  drizzled::generator::Schema schema_generator;
38
 
  const drizzled::identifier::Schema *schema_ptr;
 
38
  const drizzled::SchemaIdentifier *schema_ptr;
39
39
 
40
40
  bool table_setup();
41
41
 
61
61
    return message::table::shared_ptr();
62
62
  }
63
63
 
64
 
  operator const drizzled::identifier::Table*()
 
64
  operator const drizzled::TableIdentifier*()
65
65
  {
66
66
    do {
67
67
      while (table_iterator != table_names.end())
68
68
      {
69
 
        const drizzled::identifier::Table *_ptr= &(*table_iterator);
 
69
        const drizzled::TableIdentifier *_ptr= &(*table_iterator);
70
70
        table_iterator++;
71
71
 
72
72
        return _ptr;