← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/foreign_key.cc

  • Committer: Brian Aker
  • Date: 2011-02-18 16:48:57 UTC
  • mfrom: (2180.1.3 drizzle-staging)
  • Revision ID: brian@tangent.org-20110218164857-4n61en8wai9c91gi
Rollup all of Olaf's branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/foreign_key.cc
64
64
  pfkey->set_references_table_name(table->table.str);
65
65
 
66
66
  Key_part_spec *keypart;
67
 
  List_iterator<Key_part_spec> col_it(cols);
 
67
  List<Key_part_spec>::iterator col_it(cols);
68
68
  while ((keypart= col_it++))
69
69
  {
70
70
    pfkey->add_column_names(keypart->field_name.str);
71
71
  }
72
72
 
73
 
  List_iterator<Key_part_spec> ref_it(ref_cols);
 
73
  List<Key_part_spec>::iterator ref_it(ref_cols);
74
74
  while ((keypart= ref_it++))
75
75
  {
76
76
    pfkey->add_references_columns(keypart->field_name.str);
122
122
  if (a->columns.elements > b->columns.elements)
123
123
    return true;                                // Can't be prefix
124
124
 
125
 
  List_iterator<Key_part_spec> col_it1(a->columns);
126
 
  List_iterator<Key_part_spec> col_it2(b->columns);
 
125
  List<Key_part_spec>::iterator col_it1(a->columns);
 
126
  List<Key_part_spec>::iterator col_it2(b->columns);
127
127
  const Key_part_spec *col1, *col2;
128
128
 
129
129
#ifdef ENABLE_WHEN_INNODB_CAN_HANDLE_SWAPED_FOREIGN_KEY_COLUMNS
130
130
  while ((col1= col_it1++))
131
131
  {
132
132
    bool found= 0;
133
 
    col_it2.rewind();
 
133
    col_it2=b->columns.begin();
134
134
    while ((col2= col_it2++))
135
135
    {
136
136
      if (*col1 == *col2)
166
166
{
167
167
  CreateField  *sql_field;
168
168
  Key_part_spec *column;
169
 
  List_iterator<Key_part_spec> cols(columns);
170
 
  List_iterator<CreateField> it(table_fields);
 
169
  List<Key_part_spec>::iterator cols(columns);
 
170
  List<CreateField>::iterator it(table_fields);
171
171
  while ((column= cols++))
172
172
  {
173
 
    it.rewind();
 
173
    it= table_fields;
174
174
    while ((sql_field= it++) &&
175
175
           my_strcasecmp(system_charset_info,
176
176
                         column->field_name.str,