← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: Monty Taylor
  • Date: 2010-05-21 06:34:43 UTC
  • mfrom: (1530.4.1)
  • mto: (1530.6.1)
  • mto: This revision was merged to the branch mainline in revision 1556.
  • Revision ID: mordred@inaugust.com-20100521063443-o8yk0sbidm9utte6
Merged plugin-to-module into fix-lcov-failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
49
49
  int           error;
50
50
  Table         *table;
51
51
  optimizer::SqlSelect *select= NULL;
52
 
  READ_RECORD   info;
 
52
  ReadRecord    info;
53
53
  bool          using_limit=limit != HA_POS_ERROR;
54
54
  bool          transactional_table, const_cond;
55
55
  bool          const_cond_result;
230
230
  }
231
231
 
232
232
  if (usable_index==MAX_KEY)
233
 
    init_read_record(&info,session,table,select,1,1);
 
233
  {
 
234
    info.init_read_record(session,table,select,1,1);
 
235
  }
234
236
  else
235
 
    init_read_record_idx(&info, session, table, 1, usable_index);
 
237
  {
 
238
    info.init_read_record_idx(session, table, 1, usable_index);
 
239
  }
236
240
 
237
241
  session->set_proc_info("updating");
238
242
 
276
280
    error= 1;                                   // Aborted
277
281
 
278
282
  session->set_proc_info("end");
279
 
  end_read_record(&info);
 
283
  info.end_read_record();
280
284
 
281
285
cleanup:
282
286