~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Brian Aker
  • Date: 2008-10-06 00:33:01 UTC
  • mto: This revision was merged to the branch mainline in revision 479.
  • Revision ID: brian@gir-20081006003301-uz4u8tyrws0lxq79
Removed binlog tool (we need to rewrite it) and removed all the hooks for
embedding the server in a client tool (--awful hack).

Show diffs side-by-side

added added

removed removed

Lines of Context:
348
348
  thd->cuted_fields = 0L;
349
349
  table->next_number_field=table->found_next_number_field;
350
350
 
351
 
#ifdef HAVE_REPLICATION
352
351
  if (thd->slave_thread &&
353
352
      (info.handle_duplicates == DUP_UPDATE) &&
354
353
      (table->next_number_field != NULL) &&
355
354
      rpl_master_has_bug(&active_mi->rli, 24432))
356
355
    goto abort;
357
 
#endif
358
356
 
359
357
  error=0;
360
358
  thd_proc_info(thd, "update");
1260
1258
  restore_record(table,s->default_values);              // Get empty record
1261
1259
  table->next_number_field=table->found_next_number_field;
1262
1260
 
1263
 
#ifdef HAVE_REPLICATION
1264
1261
  if (thd->slave_thread &&
1265
1262
      (info.handle_duplicates == DUP_UPDATE) &&
1266
1263
      (table->next_number_field != NULL) &&
1267
1264
      rpl_master_has_bug(&active_mi->rli, 24432))
1268
1265
    return(1);
1269
 
#endif
1270
1266
 
1271
1267
  thd->cuted_fields=0;
1272
1268
  if (info.ignore || info.handle_duplicates != DUP_ERROR)