← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Brian Aker
  • Date: 2009-07-29 07:29:19 UTC
  • mfrom: (1103.1.4 merge)
  • Revision ID: brian@gaz-20090729072919-1pv9yqddtpoljgia
Merge of SJ code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
447
447
          (select_limit_cnt == HA_POS_ERROR || sl->braces) ?
448
448
          sl->options & ~OPTION_FOUND_ROWS : sl->options | found_rows_for_union;
449
449
 
450
 
        if (sl->join->flatten_subqueries())
451
 
          return(true);
452
 
 
453
450
        saved_error= sl->join->optimize();
454
451
      }
455
452
      if (!saved_error)