← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge trunk changes and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/weight_string.cc
18
18
 */
19
19
 
20
20
#include "config.h"
21
 
#include CSTDINT_H
 
21
 
22
22
#include <drizzled/function/str/weight_string.h>
23
23
 
24
24
#include <algorithm>
25
25
 
26
26
using namespace std;
27
27
 
 
28
namespace drizzled
 
29
{
 
30
 
28
31
void Item_func_weight_string::fix_length_and_dec()
29
32
{
30
33
  const CHARSET_INFO * const cs= args[0]->collation.collation;
66
69
  return 0;
67
70
}
68
71
 
 
72
} /* namespace drizzled */