~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2009-01-23 02:15:04 UTC
  • mfrom: (798.2.32 drizzle)
  • Revision ID: brian@tangent.org-20090123021504-2j99e6hxab1ew601
Merge for replication removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3191
3191
    }
3192
3192
    file->column_bitmaps_signal();
3193
3193
  }
3194
 
  if (file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_DELETE || (drizzle_bin_log.is_open() && in_use))
 
3194
 
3195
3195
  {
3196
3196
    /*
3197
3197
      If the handler has no cursor capabilites, or we have row-based
3242
3242
    }
3243
3243
    file->column_bitmaps_signal();
3244
3244
  }
3245
 
  if ((file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) ||
3246
 
      (drizzle_bin_log.is_open() && in_use))
 
3245
 
3247
3246
  {
3248
3247
    /*
3249
3248
      If the handler has no cursor capabilites, or we have row-based