← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/collation.cc

  • Committer: Eric Day
  • Date: 2010-01-16 19:15:44 UTC
  • mto: This revision was merged to the branch mainline in revision 1271.
  • Revision ID: eday@oddments.org-20100116191544-pdpcz98ngewb0l56
Fixed test to not output verbose drizzleslap output.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/collation.cc
18
18
 */
19
19
 
20
20
#include "config.h"
21
 
 
 
21
#include CSTDINT_H
22
22
#include <drizzled/function/str/collation.h>
23
23
 
24
 
namespace drizzled
25
 
{
26
 
 
27
24
String *Item_func_collation::val_str(String *str)
28
25
{
29
26
  assert(fixed == 1);
30
 
  size_t dummy_errors;
 
27
  uint32_t dummy_errors;
31
28
  const CHARSET_INFO * const cs= args[0]->collation.collation;
32
29
 
33
30
  null_value= 0;
36
33
  return str;
37
34
}
38
35
 
39
 
} /* namespace drizzled */
 
36