← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/item_strfunc.cc

  • Committer: Stewart Smith
  • Date: 2008-06-30 05:33:25 UTC
  • mfrom: (12.2.8 drizzle)
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: stewart@flamingspork.com-20080630053325-mwrv6bjaufcpvj8n
merge my work

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/item_strfunc.cc
2483
2483
}
2484
2484
 
2485
2485
 
2486
 
#include <my_dir.h>                             // For my_stat
 
2486
#include <my_dir.h>
2487
2487
 
2488
2488
String *Item_load_file::val_str(String *str)
2489
2489
{
2490
2490
  DBUG_ASSERT(fixed == 1);
2491
2491
  String *file_name;
2492
2492
  File file;
2493
 
  MY_STAT stat_info;
 
2493
  struct stat stat_info;
2494
2494
  char path[FN_REFLEN];
2495
2495
  DBUG_ENTER("load_file");
2496
2496
 
2505
2505
      strncmp(opt_secure_file_priv, path, strlen(opt_secure_file_priv)))
2506
2506
    goto err;
2507
2507
 
2508
 
  if (!my_stat(path, &stat_info, MYF(0)))
 
2508
  if (stat(path, &stat_info))
2509
2509
    goto err;
2510
2510
 
2511
2511
  if (!(stat_info.st_mode & S_IROTH))