← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cached_item.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 02:13:02 UTC
  • mfrom: (2318.6.56 rf)
  • Revision ID: me@mark.atwood.name-20110624021302-y9oiksid220xan9s
merge lp:~olafvdspek/drizzle/refactor14

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cached_item.cc
94
94
  {
95
95
    if ((null_value= item->null_value))
96
96
      // New value was null
97
 
      return(true);
 
97
      return true;
98
98
    tmp=true;
99
99
  }
100
100
  else if (null_value)
121
121
  {
122
122
    null_value= item->null_value;
123
123
    value=nr;
124
 
    return(true);
 
124
    return true;
125
125
  }
126
 
  return(false);
 
126
  return false;
127
127
}
128
128
 
129
129
bool Cached_item_int::cmp(void)
133
133
  {
134
134
    null_value= item->null_value;
135
135
    value=nr;
136
 
    return(true);
 
136
    return true;
137
137
  }
138
 
  return(false);
 
138
  return false;
139
139
}
140
140
 
141
141