← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/create.cc

  • Committer: Brian Aker
  • Date: 2008-12-24 02:06:33 UTC
  • Revision ID: brian@tangent.org-20081224020633-sbe7ca5yvo8yj5d3
Removal of client side collation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/create.cc
2749
2749
    The parsed item tree should not depend on
2750
2750
    <code>session->variables.collation_connection</code>.
2751
2751
  */
2752
 
  const CHARSET_INFO * const cs= session->variables.collation_connection;
 
2752
  const CHARSET_INFO * const cs= session->variables.getCollation();
2753
2753
  Item *sp;
2754
2754
 
2755
2755
  if (cs->mbminlen > 1)
3187
3187
Item*
3188
3188
create_func_char_cast(Session *session, Item *a, int len, const CHARSET_INFO * const cs)
3189
3189
{
3190
 
  const CHARSET_INFO * const real_cs= (cs ? cs : session->variables.collation_connection);
 
3190
  const CHARSET_INFO * const real_cs= (cs ? cs : session->variables.getCollation());
3191
3191
  return new (session->mem_root) Item_char_typecast(a, len, real_cs);
3192
3192
}
3193
3193