← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
156
156
  if (session->openTablesLock(table_list))
157
157
    return(true);
158
158
 
159
 
  if (setup_tables_and_check_access(session, &session->lex->select_lex.context,
160
 
                                    &session->lex->select_lex.top_join_list,
 
159
  if (setup_tables_and_check_access(session, &session->getLex()->select_lex.context,
 
160
                                    &session->getLex()->select_lex.top_join_list,
161
161
                                    table_list,
162
 
                                    &session->lex->select_lex.leaf_tables, true))
 
162
                                    &session->getLex()->select_lex.leaf_tables, true))
163
163
     return(-1);
164
164
 
165
165
  /*