← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Toru Maesaka
  • Date: 2008-12-14 08:26:38 UTC
  • mto: (670.1.24 devel)
  • mto: This revision was merged to the branch mainline in revision 676.
  • Revision ID: dev@torum.net-20081214082638-c8uje8oiwk4s2dh0
First pass of replacing MySQL's strxmov with libc alternatives

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
2034
2034
 
2035
2035
  if (!test_if_hard_path(name))
2036
2036
  {
2037
 
    strxmov(buff, opt_basedir, name, NULL);
 
2037
    sprintf(buff,"%s%s",opt_basedir,name);
2038
2038
    name=buff;
2039
2039
  }
2040
2040
  fn_format(buff, name, "", "", MY_UNPACK_FILENAME);
4526
4526
 
4527
4527
  if (!test_if_hard_path(name))
4528
4528
  {
4529
 
    strxmov(buff, opt_basedir, name, NULL);
 
4529
    sprintf(buff,"%s%s",opt_basedir,name);
4530
4530
    name=buff;
4531
4531
  }
4532
4532
  fn_format(buff, name, "", "", MY_UNPACK_FILENAME);
4572
4572
    char buff[FN_REFLEN];
4573
4573
    if (!test_if_hard_path(argument))
4574
4574
    {
4575
 
      strxmov(buff, opt_basedir, argument, NULL);
 
4575
      sprintf(buff,"%s%s",opt_basedir,argument);
4576
4576
      argument= buff;
4577
4577
    }
4578
4578
    fn_format(buff, argument, "", "", MY_UNPACK_FILENAME);
4590
4590
    static char buff[FN_REFLEN];
4591
4591
    if (!test_if_hard_path(argument))
4592
4592
    {
4593
 
      strxmov(buff, opt_basedir, argument, NULL);
 
4593
      sprintf(buff,"%s%s",opt_basedir,argument);
4594
4594
      argument= buff;
4595
4595
    }
4596
4596
    fn_format(buff, argument, "", "", MY_UNPACK_FILENAME);
4685
4685
  int flags= O_WRONLY | O_CREAT;
4686
4686
  if (!test_if_hard_path(fname))
4687
4687
  {
4688
 
    strxmov(buff, opt_basedir, fname, NULL);
 
4688
    sprintf(buff,"%s%s",opt_basedir,fname);
4689
4689
    fname= buff;
4690
4690
  }
4691
4691
  fn_format(buff, fname, "", "", MY_UNPACK_FILENAME);