← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.1.6)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20120619104649-e2l0ggd4oz3um0f4
Tags: upstream-7.1.36-stable
Import upstream version 7.1.36-stable

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/set_collation.cc
22
22
#include <drizzled/error.h>
23
23
#include <drizzled/charset.h>
24
24
 
25
 
namespace drizzled
26
 
{
 
25
namespace drizzled {
27
26
 
28
27
static const char *binary_keyword= "BINARY";
29
28
 
39
38
 
40
39
void Item_func_set_collation::fix_length_and_dec()
41
40
{
42
 
  const CHARSET_INFO *set_collation;
 
41
  const charset_info_st *set_collation;
43
42
  const char *colname;
44
43
  String tmp, *str= args[1]->val_str(&tmp);
45
44
  colname= str->c_ptr();
90
89
  str->append('(');
91
90
  args[0]->print(str);
92
91
  str->append(STRING_WITH_LEN(" collate "));
93
 
  assert(args[1]->basic_const_item() &&
94
 
              args[1]->type() == Item::STRING_ITEM);
95
 
  args[1]->str_value.print(str);
 
92
  assert(args[1]->basic_const_item() && args[1]->type() == Item::STRING_ITEM);
 
93
  args[1]->str_value.print(*str);
96
94
  str->append(')');
97
95
}
98
96