← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Brian Aker
  • Date: 2009-12-03 21:03:24 UTC
  • mto: (1237.2.7 push) (1238.1.1 push)
  • mto: This revision was merged to the branch mainline in revision 1238.
  • Revision ID: brian@gaz-20091203210324-y5e4a6qw37jajekc
Remove dead bits in parser/whitespace/etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
123
123
                 bool ignore)
124
124
{
125
125
  bool          using_limit= limit != HA_POS_ERROR;
126
 
  bool          safe_update= test(session->options & OPTION_SAFE_UPDATES);
127
126
  bool          used_key_is_modified;
128
127
  bool          transactional_table;
129
128
  bool          can_compare_record;
213
212
 
214
213
  select= make_select(table, 0, 0, conds, 0, &error);
215
214
  if (error || !limit ||
216
 
      (select && select->check_quick(session, safe_update, limit)))
 
215
      (select && select->check_quick(session, false, limit)))
217
216
  {
218
217
    delete select;
219
218
    /**
237
236
  if (table->quick_keys.none())
238
237
  {
239
238
    session->server_status|=SERVER_QUERY_NO_INDEX_USED;
240
 
    if (safe_update && !using_limit)
241
 
    {
242
 
      my_message(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE,
243
 
                 ER(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE), MYF(0));
244
 
      goto err;
245
 
    }
246
239
  }
247
240
 
248
241
  table->mark_columns_needed_for_update();