~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-07-30 02:39:13 UTC
  • mto: (1115.3.11 captain)
  • mto: This revision was merged to the branch mainline in revision 1121.
  • Revision ID: osullivan.padraig@gmail.com-20090730023913-o2zuocp32l6btnc2
Removing references to MY_BITMAP throughout the code base and updating calls
to MyBitmap in various places to use the new interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
  Field **field_p;
49
49
  Field *field;
50
50
  uint32_t keynr;
51
 
  MY_BITMAP unique_map; /* Fields in offended unique. */
 
51
  MyBitmap unique_map; /* Fields in offended unique. */
52
52
  my_bitmap_map unique_map_buf[bitmap_buffer_size(MAX_FIELDS)];
53
53
 
54
54
  /*
67
67
    return;
68
68
 
69
69
  /* Create unique_map with all fields used by that index. */
70
 
  bitmap_init(&unique_map, unique_map_buf, table->s->fields);
 
70
  unique_map.init(unique_map_buf, table->s->fields);
71
71
  table->mark_columns_used_by_index_no_reset(keynr, &unique_map);
72
72
 
73
73
  /* Subtract read_set and write_set. */
79
79
    nor in write_set, we must re-read the record.
80
80
    Otherwise no need to do anything.
81
81
  */
82
 
  if (bitmap_is_clear_all(&unique_map))
 
82
  if (unique_map.isClearAll())
83
83
    return;
84
84
 
85
85
  /* Get identifier of last read record into table->file->ref. */
90
90
  (void) table->file->rnd_pos(table->record[1], table->file->ref);
91
91
  /* Copy the newly read columns into the new record. */
92
92
  for (field_p= table->field; (field= *field_p); field_p++)
93
 
    if (bitmap_is_set(&unique_map, field->field_index))
 
93
    if (unique_map.isBitSet(field->field_index))
94
94
      field->copy_from_tmp(table->s->rec_buff_length);
95
95
 
96
96
  return;