← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Monty Taylor
  • Date: 2011-04-06 21:23:45 UTC
  • mfrom: (2268.1.4 build)
  • Revision ID: mordred@inaugust.com-20110406212345-a7w7nkcuq60ybi4z
Merge Monty: Windows Fixes
Merge Olaf: open_table refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
196
196
  having_history(NULL),
197
197
  select_options(select_options_arg),
198
198
  result(result_arg),
199
 
  lock(session_arg->lock),
 
199
  lock(session_arg->open_tables.lock),
200
200
  tmp_join(NULL),
201
201
  all_fields(fields_arg),
202
202
  error(0),
286
286
  having_history= NULL;
287
287
  select_options= select_options_arg;
288
288
  result= result_arg;
289
 
  lock= session_arg->lock;
 
289
  lock= session_arg->open_tables.lock;
290
290
  tmp_join= NULL;
291
291
  all_fields= fields_arg;
292
292
  error= 0;
2037
2037
    We are not using tables anymore
2038
2038
    Unlock all tables. We may be in an INSERT .... SELECT statement.
2039
2039
  */
2040
 
  if (can_unlock && lock && session->lock &&
 
2040
  if (can_unlock && lock && session->open_tables.lock &&
2041
2041
      !(select_options & SELECT_NO_UNLOCK) &&
2042
2042
      !select_lex->subquery_in_having &&
2043
2043
      (select_lex == (session->lex().unit.fake_select_lex ?