← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/null.h

Merge trunk changes and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/null.h
23
23
 
24
24
#include <drizzled/field/str.h>
25
25
 
 
26
namespace drizzled
 
27
{
 
28
 
26
29
/*
27
30
 * Everything saved in this will disappear. It will always return NULL
28
31
 */
114
117
  }
115
118
};
116
119
 
 
120
} /* namespace drizzled */
 
121
 
117
122
#endif /* DRIZZLED_FIELD_NULL_H */