← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Patrick Crews
  • Date: 2010-08-17 17:42:29 UTC
  • mfrom: (1711.1.24 build)
  • Revision ID: gleebix@gmail.com-20100817174229-e28p5025ndgkkxif
Rollup patch - optimizer fixes, mutex removal, client cleanup, translations update

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
5333
5333
 
5334
5334
    if (prev_table)
5335
5335
    {
5336
 
      /* The order of tables is reverse: prev_table follows table */
5337
 
      if (prev_table->straight)
 
5336
      //If this is straight join, set prev table to be dependent on all tables
 
5337
      //from this nested join, so that correct join order is selected.
 
5338
      if ((test(join->select_options & SELECT_STRAIGHT_JOIN)) ||
 
5339
          prev_table->straight)
5338
5340
        prev_table->setDepTables(prev_table->getDepTables() | used_tables);
5339
5341
      if (prev_table->on_expr)
5340
5342
      {