← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

  • Committer: Stewart Smith
  • Date: 2010-06-16 14:23:07 UTC
  • mto: (1626.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 1633.
  • Revision ID: stewart@flamingspork.com-20100616142307-xzid4yzriltwu6tt
add basic test for Handler_update status variable

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
67
67
  cur_column_ref= column_ref_it++;
68
68
  assert(!cur_column_ref || ! cur_column_ref->table_field ||
69
69
              cur_column_ref->table_ref->table ==
70
 
              cur_column_ref->table_field->getTable());
 
70
              cur_column_ref->table_field->table);
71
71
}
72
72
 
73
73
 
128
128
  if (table_ref->is_natural_join)
129
129
    return natural_join_it.column_ref()->table_name();
130
130
 
131
 
  assert(!strcmp(table_ref->getTableName(),
132
 
                 table_ref->table->getShare()->getTableName()));
133
 
  return table_ref->getTableName();
 
131
  assert(!strcmp(table_ref->table_name,
 
132
                      table_ref->table->getShare()->getTableName()));
 
133
  return table_ref->table_name;
134
134
}
135
135
 
136
136
 
143
143
    Test that TableList::db is the same as TableShare::db to
144
144
    ensure consistency. 
145
145
  */
146
 
  assert(!strcmp(table_ref->getSchemaName(), table_ref->table->getShare()->getSchemaName()));
147
 
  return table_ref->getSchemaName();
 
146
  assert(!strcmp(table_ref->db, table_ref->table->getShare()->getSchemaName()));
 
147
  return table_ref->db;
148
148
}
149
149
 
150
150
 
215
215
    assert(nj_col);
216
216
  }
217
217
  assert(!nj_col->table_field ||
218
 
              nj_col->table_ref->table == nj_col->table_field->getTable());
 
218
              nj_col->table_ref->table == nj_col->table_field->table);
219
219
 
220
220
  /*
221
221
    If the natural join column was just created add it to the list of
280
280
  nj_col= natural_join_it.column_ref();
281
281
  assert(nj_col &&
282
282
              (!nj_col->table_field ||
283
 
               nj_col->table_ref->table == nj_col->table_field->getTable()));
 
283
               nj_col->table_ref->table == nj_col->table_field->table));
284
284
  return nj_col;
285
285
}
286
286