← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

Merge in stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
136
136
  bool          using_limit= limit != HA_POS_ERROR;
137
137
  bool          used_key_is_modified;
138
138
  bool          transactional_table;
139
 
  int           error;
 
139
  int           error= 0;
140
140
  uint          used_index= MAX_KEY, dup_key_found;
141
141
  bool          need_sort= true;
142
142
  ha_rows       updated, found;
363
363
 
364
364
      if (used_index == MAX_KEY || (select && select->quick))
365
365
      {
366
 
        info.init_read_record(session, table, select, 0, true);
 
366
        if ((error= info.init_read_record(session, table, select, 0, true)))
 
367
          goto err;
367
368
      }
368
369
      else
369
370
      {
370
 
        info.init_read_record_idx(session, table, 1, used_index);
 
371
        if ((error= info.init_read_record_idx(session, table, 1, used_index)))
 
372
          goto err;
371
373
      }
372
374
 
373
375
      session->set_proc_info("Searching rows for update");
433
435
  if (select && select->quick && select->quick->reset())
434
436
    goto err;
435
437
  table->cursor->try_semi_consistent_read(1);
436
 
  info.init_read_record(session, table, select, 0, true);
 
438
  if ((error= info.init_read_record(session, table, select, 0, true)))
 
439
  {
 
440
    goto err;
 
441
  }
437
442
 
438
443
  updated= found= 0;
439
444
  /*
580
585
  return ((error >= 0 || session->is_error()) ? 1 : 0);
581
586
 
582
587
err:
 
588
  if (error != 0)
 
589
    table->print_error(error,MYF(0));
 
590
 
583
591
  delete select;
584
592
  free_underlaid_joins(session, select_lex);
585
593
  if (table->key_read)