← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_pack.cc

  • Committer: Monty Taylor
  • Date: 2008-12-01 00:45:27 UTC
  • mfrom: (629.3.7 work)
  • mto: This revision was merged to the branch mainline in revision 634.
  • Revision ID: mordred@solanthus.local-20081201004527-jqhvplt4sty2tnro
Merged from knielsen.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_pack.cc
317
317
        if (tilde_expansion[h_length-1] == FN_LIBCHAR)
318
318
          h_length--;
319
319
        if (buff+h_length < suffix)
320
 
          memcpy(buff+h_length, suffix, length);
 
320
          memmove(buff+h_length, suffix, length);
321
321
        else
322
322
          bmove_upp((unsigned char*) buff+h_length+length, (unsigned char*) suffix+length, length);
323
 
        memcpy(buff, tilde_expansion, h_length);
 
323
        memmove(buff, tilde_expansion, h_length);
324
324
      }
325
325
    }
326
326
  }