~mordred/drizzle/add-drizzle-namespace

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

MergedĀ fromĀ me.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3380
3380
      new_errno= tmp;
3381
3381
    }
3382
3382
    if (new_errno)
3383
 
      table->cursor->print_error(new_errno,MYF(0));
 
3383
      table->print_error(new_errno,MYF(0));
3384
3384
  }
3385
3385
  return(join->session->is_error() ? -1 : rc);
3386
3386
}
5403
5403
err:
5404
5404
  cursor->extra(HA_EXTRA_NO_CACHE);
5405
5405
  if (error)
5406
 
    cursor->print_error(error,MYF(0));
 
5406
    table->print_error(error,MYF(0));
5407
5407
  return(1);
5408
5408
}
5409
5409
 
5514
5514
  cursor->extra(HA_EXTRA_NO_CACHE);
5515
5515
  (void) cursor->ha_rnd_end();
5516
5516
  if (error)
5517
 
    cursor->print_error(error,MYF(0));
 
5517
    table->print_error(error,MYF(0));
5518
5518
  return(1);
5519
5519
}
5520
5520