← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/all_foreign_keys.h

  • Committer: Mark Atwood
  • Date: 2011-08-12 04:08:33 UTC
  • mfrom: (2385.2.17 refactor5)
  • Revision ID: me@mark.atwood.name-20110812040833-u6j85nc6ahuc0dtz
merge lp:~olafvdspek/drizzle/refactor5

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/all_foreign_keys.h
49
49
      do {
50
50
        if (foreign_keys_iterator != table_message.fk_constraint_size())
51
51
        {
52
 
          const message::Table::ForeignKeyConstraint &fk_constraint(table_message.fk_constraint(foreign_keys_iterator++));
53
 
          return &fk_constraint;
 
52
          return &table_message.fk_constraint(foreign_keys_iterator++);
54
53
        }
55
54
 
56
55
      } while ((table_ptr= all_tables_generator) && table_setup());
71
70
      } while ((table_ptr= all_tables_generator) && table_setup());
72
71
    }
73
72
 
74
 
    ForeignKeyConstraintPair null_pair;
75
 
    return null_pair;
 
73
    return ForeignKeyConstraintPair();
76
74
  }
77
75
};
78
76