← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_sum.cc

  • Committer: Brian Aker
  • Date: 2009-11-16 17:06:48 UTC
  • mto: (1220.1.2 staging)
  • mto: This revision was merged to the branch mainline in revision 1221.
  • Revision ID: brian@gaz-20091116170648-u9feaqfbs3twp9ct
Move print_error up to Engine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/opt_sum.cc
176
176
      error= tl->table->cursor->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
177
177
      if(error)
178
178
      {
179
 
        tl->table->cursor->print_error(error, MYF(ME_FATALERROR));
 
179
        tl->table->print_error(error, MYF(ME_FATALERROR));
180
180
        return error;
181
181
      }
182
182
      count*= tl->table->cursor->stats.records;
337
337
            if (error == HA_ERR_KEY_NOT_FOUND || error == HA_ERR_END_OF_FILE)
338
338
              return HA_ERR_KEY_NOT_FOUND;            // No rows matching WHERE
339
339
            /* HA_ERR_LOCK_DEADLOCK or some other error */
340
 
            table->cursor->print_error(error, MYF(0));
 
340
            table->print_error(error, MYF(0));
341
341
            return(error);
342
342
          }
343
343
          removed_tables|= table->map;
424
424
            if (error == HA_ERR_KEY_NOT_FOUND || error == HA_ERR_END_OF_FILE)
425
425
              return HA_ERR_KEY_NOT_FOUND;           // No rows matching WHERE
426
426
            /* HA_ERR_LOCK_DEADLOCK or some other error */
427
 
            table->cursor->print_error(error, MYF(ME_FATALERROR));
 
427
            table->print_error(error, MYF(ME_FATALERROR));
428
428
            return(error);
429
429
          }
430
430
          removed_tables|= table->map;