← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.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/table.cc
1472
1472
          my_errno= EMFILE;
1473
1473
          break;
1474
1474
        default:
1475
 
          outparam->cursor->print_error(ha_err, MYF(0));
 
1475
          outparam->print_error(ha_err, MYF(0));
1476
1476
          error_reported= true;
1477
1477
          if (ha_err == HA_ERR_TABLE_DEF_CHANGED)
1478
1478
            error= 7;
3085
3085
  if ((error=cursor->ha_open(this, s->table_name.str,O_RDWR,
3086
3086
                                  HA_OPEN_TMP_TABLE | HA_OPEN_INTERNAL_TABLE)))
3087
3087
  {
3088
 
    cursor->print_error(error,MYF(0));
 
3088
    print_error(error, MYF(0));
3089
3089
    db_stat= 0;
3090
3090
    return true;
3091
3091
  }
3218
3218
                       &create_info,
3219
3219
                       HA_CREATE_TMP_TABLE)))
3220
3220
  {
3221
 
    cursor->print_error(error,MYF(0));
 
3221
    print_error(error, MYF(0));
3222
3222
    db_stat= 0;
3223
3223
    goto err;
3224
3224
  }
3278
3278
  if (table->s->db_type() != heap_engine ||
3279
3279
      error != HA_ERR_RECORD_FILE_FULL)
3280
3280
  {
3281
 
    table->cursor->print_error(error,MYF(0));
 
3281
    table->print_error(error, MYF(0));
3282
3282
    return true;
3283
3283
  }
3284
3284
 
3354
3354
  return false;
3355
3355
 
3356
3356
 err:
3357
 
  table->cursor->print_error(write_err, MYF(0));
 
3357
  table->print_error(write_err, MYF(0));
3358
3358
  (void) table->cursor->ha_rnd_end();
3359
3359
  (void) new_table.cursor->close();
3360
3360
 err1:
3514
3514
  if (error != HA_ERR_LOCK_DEADLOCK && error != HA_ERR_LOCK_WAIT_TIMEOUT)
3515
3515
    errmsg_printf(ERRMSG_LVL_ERROR, _("Got error %d when reading table '%s'"),
3516
3516
                    error, s->path.str);
3517
 
  cursor->print_error(error,MYF(0));
 
3517
  print_error(error, MYF(0));
3518
3518
 
3519
3519
  return 1;
3520
3520
}