← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Monty Taylor
  • Date: 2010-02-16 07:18:35 UTC
  • mto: (1471.3.2 drizzled-as-lib)
  • mto: This revision was merged to the branch mainline in revision 1479.
  • Revision ID: mordred@inaugust.com-20100216071835-usfwjo51l04tobm1
Removed drizzle_ prefix from some things that don't need it since they're
in a namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
1070
1070
 
1071
1071
  if (!internal::dirname_length(exchange->file_name))
1072
1072
  {
1073
 
    strcpy(path, drizzle_real_data_home);
 
1073
    strcpy(path, data_home_real);
1074
1074
    if (! session->db.empty())
1075
 
      strncat(path, session->db.c_str(), FN_REFLEN-strlen(drizzle_real_data_home)-1);
 
1075
      strncat(path, session->db.c_str(), FN_REFLEN-strlen(data_home_real)-1);
1076
1076
    (void) internal::fn_format(path, exchange->file_name, path, "", option);
1077
1077
  }
1078
1078
  else
1079
 
    (void) internal::fn_format(path, exchange->file_name, drizzle_real_data_home, "", option);
 
1079
    (void) internal::fn_format(path, exchange->file_name, data_home_real, "", option);
1080
1080
 
1081
1081
  if (opt_secure_file_priv &&
1082
1082
      strncmp(opt_secure_file_priv, path, strlen(opt_secure_file_priv)))