← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_class.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_class.cc
1483
1483
 
1484
1484
  if (!dirname_length(exchange->file_name))
1485
1485
  {
1486
 
    strcpy(path, mysql_real_data_home);
 
1486
    strcpy(path, drizzle_real_data_home);
1487
1487
    if (session->db)
1488
 
      strncat(path, session->db, FN_REFLEN-strlen(mysql_real_data_home)-1);
 
1488
      strncat(path, session->db, FN_REFLEN-strlen(drizzle_real_data_home)-1);
1489
1489
    (void) fn_format(path, exchange->file_name, path, "", option);
1490
1490
  }
1491
1491
  else
1492
 
    (void) fn_format(path, exchange->file_name, mysql_real_data_home, "", option);
 
1492
    (void) fn_format(path, exchange->file_name, drizzle_real_data_home, "", option);
1493
1493
 
1494
1494
  if (opt_secure_file_priv &&
1495
1495
      strncmp(opt_secure_file_priv, path, strlen(opt_secure_file_priv)))