← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 02:13:02 UTC
  • mfrom: (2318.6.56 rf)
  • Revision ID: me@mark.atwood.name-20110624021302-y9oiksid220xan9s
merge lp:~olafvdspek/drizzle/refactor14

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
107
107
  if (session->is_error())
108
108
  {
109
109
    /* Error evaluating val_int(). */
110
 
    return(true);
 
110
    return true;
111
111
  }
112
112
 
113
113
  /*
369
369
  if (setup_tables_and_check_access(session, &session->lex().select_lex.context, &select_lex->top_join_list, 
370
370
    table_list, &select_lex->leaf_tables, false) ||
371
371
      session->setup_conds(table_list, conds))
372
 
    return(true);
 
372
    return true;
373
373
 
374
374
  if (unique_table(table_list, table_list->next_global))
375
375
  {
376
376
    my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->alias);
377
 
    return(true);
 
377
    return true;
378
378
  }
379
379
  List<Item> all_fields;
380
380
  if (select_lex->inner_refs_list.size() && fix_inner_refs(session, all_fields, select_lex, select_lex->ref_pointer_array))
381
 
    return(true);
382
 
  return(false);
 
381
    return true;
 
382
  return false;
383
383
}
384
384
 
385
385