← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/null.h

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/null.h
42
42
 
43
43
  Field_null(unsigned char *ptr_arg,
44
44
             uint32_t len_arg,
45
 
             const char *field_name_arg) :
46
 
    Field_str(ptr_arg,
47
 
              len_arg,
48
 
              null,
49
 
              1,
50
 
              field_name_arg,
51
 
              &my_charset_bin)
 
45
             const char *field_name_arg,
 
46
             const CHARSET_INFO * const cs)
 
47
    :Field_str(ptr_arg,
 
48
               len_arg,
 
49
               null,
 
50
               1,
 
51
                     field_name_arg,
 
52
               cs)
52
53
  {}
53
 
 
54
54
  enum_field_types type() const
55
55
  {
56
56
    return DRIZZLE_TYPE_NULL;
79
79
  {
80
80
    return 0;
81
81
  }
82
 
  double val_real(void) const
 
82
  double val_real(void)
83
83
  {
84
84
    return 0.0;
85
85
  }
86
 
  int64_t val_int(void) const
87
 
  {
88
 
    return 0;
89
 
  }
90
 
  type::Decimal *val_decimal(type::Decimal *) const
91
 
  {
92
 
    return 0;
93
 
  }
94
 
  String *val_str(String *, String *value2) const
 
86
  int64_t val_int(void)
 
87
  {
 
88
    return 0;
 
89
  }
 
90
  type::Decimal *val_decimal(type::Decimal *)
 
91
  {
 
92
    return 0;
 
93
  }
 
94
  String *val_str(String *, String *value2)
95
95
  {
96
96
    value2->length(0);
97
97
    return value2;