← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/trim.h

Merge trunk changes and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/trim.h
22
22
 
23
23
#include <drizzled/function/str/strfunc.h>
24
24
 
 
25
namespace drizzled
 
26
{
 
27
 
25
28
class Item_func_trim :public Item_str_func
26
29
{
27
30
protected:
58
61
  const char *mode_name() const { return "trailing"; }
59
62
};
60
63
 
61
 
 
 
64
} /* namespace drizzled */
62
65
 
63
66
#endif /* DRIZZLED_FUNCTION_STR_TRIM_H */