← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_symlink2.cc

  • Committer: Diego Medina
  • Date: 2009-10-05 04:05:29 UTC
  • mfrom: (1161 staging)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: diego.medina@sun.com-20091005040529-5g1qe9gxzslpgefd
resolved small merge issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_symlink2.cc
134
134
  char link_name[FN_REFLEN], tmp_name[FN_REFLEN];
135
135
  int sym_link_size= -1;
136
136
  int was_symlink= (!my_disable_symlinks &&
137
 
                   (sym_link_size= readlink(from,link_name,FN_REFLEN-1)) != -1);
 
137
                   (sym_link_size= static_cast<int>(readlink(from,link_name,
 
138
                                                    FN_REFLEN-1))) != -1); 
138
139
  int result=0;
139
140
  int name_is_different;
140
141