← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Mark Atwood
  • Date: 2011-06-25 15:38:53 UTC
  • mfrom: (2318.6.78 refactor16)
  • Revision ID: me@mark.atwood.name-20110625153853-za5fjiwd3z0aykdd
merge lp:~olafvdspek/drizzle/refactor16

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
472
472
          if (union_result->flush())
473
473
          {
474
474
            session->lex().current_select= lex_select_save;
475
 
            return(1);
 
475
            return 1;
476
476
          }
477
477
        }
478
478
      }
486
486
      if (error)
487
487
      {
488
488
        table->print_error(error, MYF(0));
489
 
        return(1);
 
489
        return 1;
490
490
      }
491
491
      if (found_rows_for_union && !sl->braces &&
492
492
          select_limit_cnt != HA_POS_ERROR)