← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Brian Aker
  • Date: 2010-12-16 22:50:48 UTC
  • mfrom: (1999.4.3 timestamp)
  • mto: This revision was merged to the branch mainline in revision 2003.
  • Revision ID: brian@tangent.org-20101216225048-e3y1v40yfb42n8wk
Merge in field/optimization on tbale sort/encap position

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
206
206
    */
207
207
    if (table->timestamp_field)
208
208
    {
209
 
      if (table->isWriteSet(table->timestamp_field->field_index))
 
209
      if (table->isWriteSet(table->timestamp_field->position()))
 
210
      {
210
211
        table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
 
212
      }
211
213
      else
212
214
      {
213
 
        table->setWriteSet(table->timestamp_field->field_index);
 
215
        table->setWriteSet(table->timestamp_field->position());
214
216
      }
215
217
    }
216
218
    /* Fix the expressions in SET clause */