← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/load_file.cc

  • Committer: lbieber
  • Date: 2010-09-26 02:09:47 UTC
  • mfrom: (1791.3.5 local-catalog)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: lbieber@orisndriz08-20100926020947-o28psemscwvlwg05
Merge Monty - Beginning of catalog support, adds a default local catalog. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/load_file.cc
42
42
  if (!(file_name= args[0]->val_str(str)))
43
43
    goto err;
44
44
 
45
 
  (void) internal::fn_format(path, file_name->c_ptr(), data_home_real, "",
 
45
  (void) internal::fn_format(path, file_name->c_ptr(), getDataHome().c_str(), "",
46
46
                   MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
47
47
 
48
48
  /* Read only allowed from within dir specified by secure_file_priv */