← Back to branch summary

~ubuntu-branches/ubuntu/saucy/drizzle/saucy-proposed

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2011-03-15 10:41:18 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110315104118-eaf0hvlytjdl4zrf
Tags: 2011.03.13-0ubuntu1
* New upstream release.
* Added slave plugin.
* Removed archive, blackhole and blitzdb plugins.
* Moved location of libdrizzle headers.
* Removed drizzleadmin manpage patch.
* Add drizzle_safe_write_string to symbols.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/set_collation.cc
85
85
  return 1;
86
86
}
87
87
 
88
 
void Item_func_set_collation::print(String *str, enum_query_type query_type)
 
88
void Item_func_set_collation::print(String *str)
89
89
{
90
90
  str->append('(');
91
 
  args[0]->print(str, query_type);
 
91
  args[0]->print(str);
92
92
  str->append(STRING_WITH_LEN(" collate "));
93
93
  assert(args[1]->basic_const_item() &&
94
94
              args[1]->type() == Item::STRING_ITEM);