← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

Merge from Monty's tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
259
259
#endif
260
260
    if (!dirname_length(ex->file_name))
261
261
    {
262
 
      strxnmov(name, FN_REFLEN-1, mysql_real_data_home, tdb, NULL);
 
262
      strcpy(name, mysql_real_data_home);
 
263
      strncat(name, tdb, FN_REFLEN-strlen(mysql_real_data_home)-1);
263
264
      (void) fn_format(name, ex->file_name, name, "",
264
265
                       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
265
266
    }