~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2008-11-11 04:33:12 UTC
  • Revision ID: brian@gir-3.local-20081111043312-3ohwkryi7k10lr4z
Second pass through on replication row patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
3195
3195
    }
3196
3196
    file->column_bitmaps_signal();
3197
3197
  }
3198
 
  if (file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_DELETE ||
3199
 
      (mysql_bin_log.is_open() && in_use && in_use->current_stmt_binlog_row_based))
 
3198
  if (file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_DELETE || (mysql_bin_log.is_open() && in_use))
3200
3199
  {
3201
3200
    /*
3202
3201
      If the handler has no cursor capabilites, or we have row-based
3248
3247
    file->column_bitmaps_signal();
3249
3248
  }
3250
3249
  if ((file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) ||
3251
 
      (mysql_bin_log.is_open() && in_use && in_use->current_stmt_binlog_row_based))
 
3250
      (mysql_bin_log.is_open() && in_use))
3252
3251
  {
3253
3252
    /*
3254
3253
      If the handler has no cursor capabilites, or we have row-based