← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Lee Bieber
  • Date: 2010-12-10 21:36:15 UTC
  • mfrom: (1992.1.3 build)
  • Revision ID: kalebral@gmail.com-20101210213615-qt9c09pg7epgdomq
Merge Evan - Add some extra details to the libdrizzle documentation
Merge Shrews - Fix compiler warning about "comparison between signed and unsigned integer expressions
Merge Monty - We were leaving link-warning.h out of the tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
98
98
  /* Copy the newly read columns into the new record. */
99
99
  for (field_p= table->getFields(); (field= *field_p); field_p++)
100
100
  {
101
 
    if (unique_map.test(field->position()))
 
101
    if (unique_map.test(field->field_index))
102
102
    {
103
103
      field->copy_from_tmp(table->getShare()->rec_buff_length);
104
104
    }
189
189
      if (table->timestamp_field_type == TIMESTAMP_AUTO_SET_ON_UPDATE ||
190
190
          table->timestamp_field_type == TIMESTAMP_AUTO_SET_ON_BOTH)
191
191
      {
192
 
        table->setWriteSet(table->timestamp_field->position());
 
192
        table->setWriteSet(table->timestamp_field->field_index);
193
193
      }
194
194
    }
195
195
  }