← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

Merged embedded-innodb-bug586348-merge into embedded-innodb-isolation-level.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
73
73
    return;
74
74
 
75
75
  /* Create unique_map with all fields used by that index. */
76
 
  unique_map.init(unique_map_buf, table->s->fields);
 
76
  unique_map.init(unique_map_buf, table->getMutableShare()->fields);
77
77
  table->mark_columns_used_by_index_no_reset(keynr, &unique_map);
78
78
 
79
79
  /* Subtract read_set and write_set. */
97
97
  /* Copy the newly read columns into the new record. */
98
98
  for (field_p= table->field; (field= *field_p); field_p++)
99
99
    if (unique_map.isBitSet(field->field_index))
100
 
      field->copy_from_tmp(table->s->rec_buff_length);
 
100
      field->copy_from_tmp(table->getShare()->rec_buff_length);
101
101
 
102
102
  return;
103
103
}
156
156
  table= table_list->table;
157
157
 
158
158
  /* Calculate "table->covering_keys" based on the WHERE */
159
 
  table->covering_keys= table->s->keys_in_use;
 
159
  table->covering_keys= table->getShare()->keys_in_use;
160
160
  table->quick_keys.reset();
161
161
 
162
162
  if (mysql_prepare_update(session, table_list, &conds, order_num, order))