← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

Merge in tdavies order c++ conversion

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
789
789
 
790
790
Table *
791
791
create_tmp_table(Session *session,Tmp_Table_Param *param,List<Item> &fields,
792
 
                 order_st *group, bool distinct, bool save_sum_fields,
 
792
                 Order *group, bool distinct, bool save_sum_fields,
793
793
                 uint64_t select_options, ha_rows rows_limit,
794
794
                 const char *table_alias)
795
795
{
823
823
    {
824
824
      group= 0;                                 // Can't use group key
825
825
    }
826
 
    else for (order_st *tmp=group ; tmp ; tmp=tmp->next)
 
826
    else for (Order *tmp=group ; tmp ; tmp=tmp->next)
827
827
    {
828
828
      /*
829
829
        marker == 4 means two things:
1256
1256
    keyinfo->rec_per_key= 0;
1257
1257
    keyinfo->algorithm= HA_KEY_ALG_UNDEF;
1258
1258
    keyinfo->name= (char*) "group_key";
1259
 
    order_st *cur_group= group;
 
1259
    Order *cur_group= group;
1260
1260
    for (; cur_group ; cur_group= cur_group->next, key_part_info++)
1261
1261
    {
1262
1262
      Field *field=(*cur_group->item)->get_tmp_table_field();