← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time.cc

Merged from Mats.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/time.cc
626
626
  {
627
627
    /* Put format string after current pos */
628
628
    new_format->format.str= (char*) (new_format+1);
629
 
    memcpy((char*) new_format->positions, (char*) format->positions,
 
629
    memcpy(new_format->positions, format->positions,
630
630
           sizeof(format->positions));
631
631
    new_format->time_separator= format->time_separator;
632
632
    /* We make the string null terminated for easy printf in SHOW VARIABLES */
633
 
    memcpy((char*) new_format->format.str, format->format.str,
 
633
    memcpy(new_format->format.str, format->format.str,
634
634
           format->format.length);
635
635
    new_format->format.str[format->format.length]= 0;
636
636
    new_format->format.length= format->format.length;