← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Brian Aker
  • Date: 2009-08-04 22:10:23 UTC
  • mto: This revision was merged to the branch mainline in revision 1111.
  • Revision ID: brian@gaz-20090804221023-ghbxmjoivqihpfc7
Move names around a bit (to align similar methods)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
140
140
    my_error(ER_WRONG_FIELD_TERMINATORS,MYF(0),enclosed->c_ptr(), enclosed->length());
141
141
    return(true);
142
142
  }
143
 
  if (session->open_and_lock_tables(table_list))
 
143
 
 
144
  if (session->openTablesLock(table_list))
144
145
    return(true);
 
146
 
145
147
  if (setup_tables_and_check_access(session, &session->lex->select_lex.context,
146
148
                                    &session->lex->select_lex.top_join_list,
147
149
                                    table_list,