← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ref_null_helper.cc

Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ref_null_helper.cc
18
18
 */
19
19
 
20
20
#include "config.h"
 
21
 
21
22
#include <drizzled/item/ref.h>
22
23
#include <drizzled/item/ref_null_helper.h>
23
24
#include <drizzled/item/subselect.h>
 
25
#include <drizzled/lex_string.h>
24
26
 
25
27
namespace drizzled
26
28
{
43
45
}
44
46
 
45
47
 
46
 
my_decimal *Item_ref_null_helper::val_decimal(my_decimal *decimal_value)
 
48
type::Decimal *Item_ref_null_helper::val_decimal(type::Decimal *decimal_value)
47
49
{
48
50
  assert(fixed == 1);
49
 
  my_decimal *val= (*ref)->val_decimal_result(decimal_value);
 
51
  type::Decimal *val= (*ref)->val_decimal_result(decimal_value);
50
52
  owner->was_null|= null_value= (*ref)->null_value;
51
53
  return val;
52
54
}
68
70
  return tmp;
69
71
}
70
72
 
71
 
bool Item_ref_null_helper::get_date(DRIZZLE_TIME *ltime, uint32_t fuzzydate)
 
73
bool Item_ref_null_helper::get_date(type::Time &ltime, uint32_t fuzzydate)
72
74
{
73
75
  return (owner->was_null|= null_value= (*ref)->get_date(ltime, fuzzydate));
74
76
}