← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Brian Aker
  • Date: 2010-04-17 19:30:18 UTC
  • mfrom: (1471.3.5 drizzled-as-lib)
  • Revision ID: brian@gaz-20100417193018-knv47o35k146bnow
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
258
258
#endif
259
259
    if (!internal::dirname_length(ex->file_name))
260
260
    {
261
 
      strcpy(name, drizzle_real_data_home);
262
 
      strncat(name, tdb, FN_REFLEN-strlen(drizzle_real_data_home)-1);
 
261
      strcpy(name, data_home_real);
 
262
      strncat(name, tdb, FN_REFLEN-strlen(data_home_real)-1);
263
263
      (void) internal::fn_format(name, ex->file_name, name, "",
264
264
                       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
265
265
    }
266
266
    else
267
267
    {
268
 
      (void) internal::fn_format(name, ex->file_name, drizzle_real_data_home, "",
 
268
      (void) internal::fn_format(name, ex->file_name, data_home_real, "",
269
269
                       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
270
270
 
271
271
      if (opt_secure_file_priv &&