← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Brian Aker
  • Date: 2010-06-05 00:14:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1592.
  • Revision ID: brian@gir-20100605001439-kn5v6oaspacx5q6l
Merge in change to getTable() to private the field objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
370
370
    {
371
371
      table->restoreRecordAsDefault();  // Get empty record
372
372
 
373
 
      if (fill_record(session, table->field, *values))
 
373
      if (fill_record(session, table->getFields(), *values))
374
374
      {
375
375
        if (values_list.elements != 1 && ! session->is_error())
376
376
        {
956
956
{
957
957
  int err= 0;
958
958
 
959
 
  for (Field **field=entry->field ; *field ; field++)
 
959
  for (Field **field=entry->getFields() ; *field ; field++)
960
960
  {
961
961
    if (((*field)->isWriteSet()) == false)
962
962
    {
1299
1299
  if (fields->elements)
1300
1300
    fill_record(session, *fields, values, true);
1301
1301
  else
1302
 
    fill_record(session, table->field, values, true);
 
1302
    fill_record(session, table->getFields(), values, true);
1303
1303
}
1304
1304
 
1305
1305
void select_insert::send_error(uint32_t errcode,const char *err)
1646
1646
  }
1647
1647
 
1648
1648
 /* First field to copy */
1649
 
  field= table->field+table->getShare()->sizeFields() - values.elements;
 
1649
  field= table->getFields() + table->getShare()->sizeFields() - values.elements;
1650
1650
 
1651
1651
  /* Mark all fields that are given values */
1652
1652
  for (Field **f= field ; *f ; f++)