← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

merge latest from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
390
390
  return res;
391
391
}
392
392
 
393
 
#define MAGIC_IN_WHERE_TOP_LEVEL 10
394
393
/**
395
394
  Function to setup clauses without sum functions.
396
395
*/
12058
12057
  {
12059
12058
    copy_fields(&join->tmp_table_param);
12060
12059
    copy_funcs(join->tmp_table_param.items_to_copy);
12061
 
#ifdef TO_BE_DELETED
12062
 
    if (!table->uniques)                        // If not unique handling
12063
 
    {
12064
 
      /* Copy null values from group to row */
12065
 
      order_st   *group;
12066
 
      for (group=table->group ; group ; group=group->next)
12067
 
      {
12068
 
        Item *item= *group->item;
12069
 
        if (item->maybe_null)
12070
 
        {
12071
 
          Field *field=item->get_tmp_table_field();
12072
 
          field->ptr[-1]= (unsigned char) (field->is_null() ? 1 : 0);
12073
 
        }
12074
 
      }
12075
 
    }
12076
 
#endif
12077
12060
    if (!join->having || join->having->val_int())
12078
12061
    {
12079
12062
      int error;