← 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-12-17 00:08:06 UTC
  • mfrom: (2002.1.4 clean)
  • Revision ID: brian@tangent.org-20101217000806-fa6kmggjnhsl4q85
Rollup for field encapsulation, monty fix for bzrignore, and Andrew bug
fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
129
129
      }
130
130
      else
131
131
      {
132
 
        table->setWriteSet(table->timestamp_field->field_index);
 
132
        table->setWriteSet(table->timestamp_field->position());
133
133
      }
134
134
    }
135
135
  }
170
170
      Unmark the timestamp field so that we can check if this is modified
171
171
      by update_fields
172
172
    */
173
 
    timestamp_mark= table->write_set->test(table->timestamp_field->field_index);
174
 
    table->write_set->reset(table->timestamp_field->field_index);
 
173
    timestamp_mark= table->write_set->test(table->timestamp_field->position());
 
174
    table->write_set->reset(table->timestamp_field->position());
175
175
  }
176
176
 
177
177
  /* Check the fields we are going to modify */
189
189
 
190
190
    if (timestamp_mark)
191
191
    {
192
 
      table->setWriteSet(table->timestamp_field->field_index);
 
192
      table->setWriteSet(table->timestamp_field->position());
193
193
    }
194
194
  }
195
195
  return 0;
1704
1704
 
1705
1705
  /* Mark all fields that are given values */
1706
1706
  for (Field **f= field ; *f ; f++)
1707
 
    table->setWriteSet((*f)->field_index);
 
1707
  {
 
1708
    table->setWriteSet((*f)->position());
 
1709
  }
1708
1710
 
1709
1711
  /* Don't set timestamp if used */
1710
1712
  table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;