← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.cc

  • Committer: Lee Bieber
  • Date: 2011-03-03 19:19:28 UTC
  • mfrom: (2216.1.3 build)
  • Revision ID: kalebral@gmail.com-20110303191928-h2kris5kavbgmzu0
Merge Shrews - 728432: Remove write_bin_log() since it is no longer used.
Merge Andrew - 722988: wrong message for drizzled --verbose 
Merge Andrew - 728314: mysql socket file not created
Merge Stewart - 728288: enum_query_type is unused

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.cc
95
95
  return 0;
96
96
}
97
97
 
98
 
void Item_string::print(String *str, enum_query_type query_type)
 
98
void Item_string::print(String *str)
99
99
{
100
 
  if (query_type == QT_ORDINARY && is_cs_specified())
 
100
  if (is_cs_specified())
101
101
  {
102
102
    str->append('_');
103
103
    str->append(collation.collation->csname);