← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/set_user_var.cc

  • Committer: Brian Aker
  • Date: 2010-12-19 06:20:54 UTC
  • mfrom: (2005.1.1 bug673105)
  • Revision ID: brian@tangent.org-20101219062054-1kt0l3dxs4z2z8md
Merge Dave.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/set_user_var.cc
231
231
                         DERIVATION_IMPLICIT, 0);
232
232
      else
233
233
        res= update_hash((void*) save_result.vdec,
234
 
                         sizeof(type::Decimal), DECIMAL_RESULT,
 
234
                         sizeof(my_decimal), DECIMAL_RESULT,
235
235
                         &my_charset_bin, DERIVATION_IMPLICIT, 0);
236
236
      break;
237
237
    }
270
270
}
271
271
 
272
272
 
273
 
type::Decimal *Item_func_set_user_var::val_decimal(type::Decimal *val)
 
273
my_decimal *Item_func_set_user_var::val_decimal(my_decimal *val)
274
274
{
275
275
  assert(fixed == 1);
276
276
  check(0);
303
303
}
304
304
 
305
305
 
306
 
type::Decimal *Item_func_set_user_var::val_decimal_result(type::Decimal *val)
 
306
my_decimal *Item_func_set_user_var::val_decimal_result(my_decimal *val)
307
307
{
308
308
  assert(fixed == 1);
309
309
  check(true);
341
341
      tmp_field->col_name=Item::name;               // Use user supplied name
342
342
  }
343
343
  else
344
 
  {
345
344
    Item::make_field(tmp_field);
346
 
  }
347
345
}
348
346
 
349
347
/*
426
424
  }
427
425
  else if (result_type() == DECIMAL_RESULT)
428
426
  {
429
 
    type::Decimal decimal_value;
430
 
    type::Decimal *val= entry->val_decimal(&null_value, &decimal_value);
 
427
    my_decimal decimal_value;
 
428
    my_decimal *val= entry->val_decimal(&null_value, &decimal_value);
431
429
    if (null_value)
432
430
      return set_field_to_null(field);
433
431
    field->set_notnull();