← 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: 2009-06-09 20:28:16 UTC
  • mfrom: (1058 staging)
  • mto: This revision was merged to the branch mainline in revision 1060.
  • Revision ID: mordred@inaugust.com-20090609202816-jk2w5vgkvejn8nrd
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
622
622
    error= -1;
623
623
    return(1);
624
624
  }
625
 
  if (const_tables && !session->locked_tables &&
626
 
      !(select_options & SELECT_NO_UNLOCK))
 
625
  if (const_tables && !(select_options & SELECT_NO_UNLOCK))
627
626
    mysql_unlock_some_tables(session, table, const_tables);
628
627
  if (!conds && outer_join)
629
628
  {