← Back to branch summary

~stewart/drizzle/use-catalog-for-path

« back to all changes in this revision

Viewing changes to drizzled/function/time/date_format.cc

  • Committer: Brian Aker
  • Date: 2011-03-28 02:46:21 UTC
  • Revision ID: brian@tangent.org-20110328024621-wtkdtlvdplqm0ybf
Shift CHARSET_INFO to charset_info_st

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date_format.cc
269
269
  Item *arg1= args[1];
270
270
 
271
271
  decimals=0;
272
 
  const CHARSET_INFO * const cs= getSession().variables.getCollation();
 
272
  const charset_info_st * const cs= getSession().variables.getCollation();
273
273
  collation.set(cs, arg1->collation.derivation);
274
274
  if (arg1->type() == STRING_ITEM)
275
275
  {                                             // Optimize the normal case