← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2010-08-17 01:34:55 UTC
  • mto: (1711.1.23 build)
  • mto: This revision was merged to the branch mainline in revision 1714.
  • Revision ID: brian@tangent.org-20100817013455-zx3nm7qilxvpwrgb
Style on structure cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
5505
5505
  return(1);
5506
5506
}
5507
5507
 
5508
 
SORT_FIELD *make_unireg_sortorder(order_st *order, uint32_t *length, SORT_FIELD *sortorder)
 
5508
SortField *make_unireg_sortorder(order_st *order, uint32_t *length, SortField *sortorder)
5509
5509
{
5510
5510
  uint32_t count;
5511
 
  SORT_FIELD *sort,*pos;
 
5511
  SortField *sort,*pos;
5512
5512
 
5513
5513
  count=0;
5514
5514
  for (order_st *tmp = order; tmp; tmp=tmp->next)
5515
5515
    count++;
5516
5516
  if (!sortorder)
5517
 
    sortorder= (SORT_FIELD*) memory::sql_alloc(sizeof(SORT_FIELD) *
 
5517
    sortorder= (SortField*) memory::sql_alloc(sizeof(SortField) *
5518
5518
                                       (max(count, *length) + 1));
5519
5519
  pos= sort= sortorder;
5520
5520