← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.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:
drizzled/sql_load.cc
260
260
#endif
261
261
    if (!dirname_length(ex->file_name))
262
262
    {
263
 
      strcpy(name, mysql_real_data_home);
264
 
      strncat(name, tdb, FN_REFLEN-strlen(mysql_real_data_home)-1);
 
263
      strcpy(name, drizzle_real_data_home);
 
264
      strncat(name, tdb, FN_REFLEN-strlen(drizzle_real_data_home)-1);
265
265
      (void) fn_format(name, ex->file_name, name, "",
266
266
                       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
267
267
    }
268
268
    else
269
269
    {
270
 
      (void) fn_format(name, ex->file_name, mysql_real_data_home, "",
 
270
      (void) fn_format(name, ex->file_name, drizzle_real_data_home, "",
271
271
                       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
272
272
 
273
273
      if (opt_secure_file_priv &&