~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_strfunc.cc

  • Committer: Monty Taylor
  • Date: 2008-11-07 04:42:46 UTC
  • mfrom: (575.4.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: monty@inaugust.com-20081107044246-n8hnlrzsjn0uvca0
Merged from ysano. Reverted changes to storage/innobase/handler, which is not built by drizzle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2277
2277
  if (!(file_name= args[0]->val_str(str)))
2278
2278
    goto err;
2279
2279
 
2280
 
  (void) fn_format(path, file_name->c_ptr(), mysql_real_data_home, "",
 
2280
  (void) fn_format(path, file_name->c_ptr(), drizzle_real_data_home, "",
2281
2281
                   MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
2282
2282
 
2283
2283
  /* Read only allowed from within dir specified by secure_file_priv */