← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2009-05-15 19:36:46 UTC
  • mfrom: (1022.1.3 merge)
  • Revision ID: brian@gaz-20090515193646-g0vvy78rkk08e440
Merge in changes for charset and dead code cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date_format.cc
261
261
 
262
262
  decimals=0;
263
263
  const CHARSET_INFO * const cs= session->variables.getCollation();
264
 
  uint32_t repertoire= arg1->collation.repertoire;
265
 
  if (!session->variables.lc_time_names->is_ascii)
266
 
    repertoire|= MY_REPERTOIRE_EXTENDED;
267
 
  collation.set(cs, arg1->collation.derivation, repertoire);
 
264
  collation.set(cs, arg1->collation.derivation);
268
265
  if (arg1->type() == STRING_ITEM)
269
266
  {                                             // Optimize the normal case
270
267
    fixed_length=1;