← 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-11-18 06:11:12 UTC
  • mfrom: (1220.1.10 staging)
  • Revision ID: brian@gaz-20091118061112-tyf4qrfr5v7i946b
Monty + Brian Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
83
83
  int error;
84
84
  if ((error=table->cursor->extra(HA_EXTRA_NO_CACHE)))
85
85
  {
86
 
    table->cursor->print_error(error, MYF(0));
 
86
    table->print_error(error, MYF(0));
87
87
    return 1;
88
88
  }
89
89
  return 0;
480
480
      }
481
481
      /* Needed for the following test and for records_at_start in next loop */
482
482
      int error= table->cursor->info(HA_STATUS_VARIABLE);
483
 
      if(error)
 
483
      if (error)
484
484
      {
485
 
        table->cursor->print_error(error, MYF(0));
 
485
        table->print_error(error, MYF(0));
486
486
        return(1);
487
487
      }
488
488
      if (found_rows_for_union && !sl->braces &&