← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/create.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/create.cc
1854
1854
    The parsed item tree should not depend on
1855
1855
    <code>session->variables.collation_connection</code>.
1856
1856
  */
1857
 
  const CHARSET_INFO * const cs= session->variables.getCollation();
 
1857
  const charset_info_st * const cs= session->variables.getCollation();
1858
1858
  Item *sp;
1859
1859
 
1860
1860
  if (cs->mbminlen > 1)
2074
2074
 
2075
2075
 
2076
2076
Item*
2077
 
create_func_char_cast(Session *session, Item *a, int len, const CHARSET_INFO * const cs)
 
2077
create_func_char_cast(Session *session, Item *a, int len, const charset_info_st * const cs)
2078
2078
{
2079
 
  const CHARSET_INFO * const real_cs= (cs ? cs : session->variables.getCollation());
 
2079
  const charset_info_st * const real_cs= (cs ? cs : session->variables.getCollation());
2080
2080
  return new (session->mem_root) Item_char_typecast(a, len, real_cs);
2081
2081
}
2082
2082
 
2084
2084
Item *
2085
2085
create_func_cast(Session *session, Item *a, Cast_target cast_type,
2086
2086
                 const char *c_len, const char *c_dec,
2087
 
                 const CHARSET_INFO * const cs)
 
2087
                 const charset_info_st * const cs)
2088
2088
{
2089
2089
  Item *res= NULL;
2090
2090
  uint32_t len;