← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: Brian Aker
  • Date: 2009-08-05 08:23:47 UTC
  • mfrom: (1109.1.6 merge)
  • Revision ID: brian@gaz-20090805082347-j2l9604jru68iu7s
Merge Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
52
52
  Session::killed_state killed_status= Session::NOT_KILLED;
53
53
 
54
54
 
55
 
  if (session->open_and_lock_tables(table_list))
56
 
    return(true);
 
55
  if (session->openTablesLock(table_list))
 
56
    return true;
57
57
 
58
58
  table= table_list->table;
59
59
  assert(table);
360
360
                                    &session->lex->select_lex.top_join_list,
361
361
                                    table_list,
362
362
                                    &select_lex->leaf_tables, false) ||
363
 
      setup_conds(session, table_list, conds))
 
363
      session->setup_conds(table_list, conds))
364
364
    return(true);
365
365
  {
366
366
    TableList *duplicate;
421
421
                    share->db.str, share->table_name.str, &create_info, 1,
422
422
                    NULL);
423
423
    // We don't need to call invalidate() because this table is not in cache
424
 
    if ((error= (int) !(open_temporary_table(session, share->path.str,
425
 
                                             share->db.str,
426
 
                                             share->table_name.str, 1,
427
 
                                             OTM_OPEN))))
428
 
      (void) rm_temporary_table(table_type, path);
 
424
    if ((error= (int) !(session->open_temporary_table(share->path.str,
 
425
                                                      share->db.str,
 
426
                                                      share->table_name.str, 1,
 
427
                                                      OTM_OPEN))))
 
428
      (void) session->rm_temporary_table(table_type, path);
429
429
    share->free_table_share();
430
430
    free((char*) table);
431
431
    /*