← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/sum.cc

  • Committer: Brian Aker
  • Date: 2010-11-03 16:49:41 UTC
  • mfrom: (1900 merge)
  • mto: This revision was merged to the branch mainline in revision 1902.
  • Revision ID: brian@tangent.org-20101103164941-bil4aktjwrm3jo8a
Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.cc
2603
2603
  tmp_table_param->force_copy_fields= force_copy_fields;
2604
2604
  assert(table == 0);
2605
2605
 
2606
 
  if (!(table= create_tmp_table(session, tmp_table_param, list, (order_st*) 0, 1,
 
2606
  if (!(table= create_tmp_table(session, tmp_table_param, list, (Order*) 0, 1,
2607
2607
                                0,
2608
2608
                                (select_lex->options | session->options),
2609
2609
                                HA_POS_ERROR, (char*)"")))
2838
2838
                                    const void* key2)
2839
2839
{
2840
2840
  Item_func_group_concat* grp_item= (Item_func_group_concat*) arg;
2841
 
  order_st **order_item, **end;
 
2841
  Order **order_item, **end;
2842
2842
  Table *table= grp_item->table;
2843
2843
 
2844
2844
  for (order_item= grp_item->order, end=order_item+ grp_item->arg_count_order;
2982
2982
    order - arg_count_order
2983
2983
  */
2984
2984
  if (!(args= (Item**) memory::sql_alloc(sizeof(Item*) * arg_count +
2985
 
                                 sizeof(order_st*)*arg_count_order)))
 
2985
                                 sizeof(Order*)*arg_count_order)))
2986
2986
    return;
2987
2987
 
2988
 
  order= (order_st**)(args + arg_count);
 
2988
  order= (Order**)(args + arg_count);
2989
2989
 
2990
2990
  /* fill args items of show and sort */
2991
2991
  List_iterator_fast<Item> li(*select_list);
2995
2995
 
2996
2996
  if (arg_count_order)
2997
2997
  {
2998
 
    order_st **order_ptr= order;
2999
 
    for (order_st *order_item= (order_st*) order_list->first;
 
2998
    Order **order_ptr= order;
 
2999
    for (Order *order_item= (Order*) order_list->first;
3000
3000
         order_item != NULL;
3001
3001
         order_item= order_item->next)
3002
3002
    {
3263
3263
    field list.
3264
3264
  */
3265
3265
  if (!(table= create_tmp_table(session, tmp_table_param, all_fields,
3266
 
                                (order_st*) 0, 0, true,
 
3266
                                (Order*) 0, 0, true,
3267
3267
                                (select_lex->options | session->options),
3268
3268
                                HA_POS_ERROR, (char*) "")))
3269
3269
  {