← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2010-10-05 19:17:56 UTC
  • mto: (1819.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1820.
  • Revision ID: mordred@inaugust.com-20101005191756-9fyh336n95efmhro
Expand secure-file-priv once at startup rather than on each path check.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
724
724
  }
725
725
}
726
726
 
 
727
static void expand_secure_file_priv(fs::path in_secure_file_priv)
 
728
{
 
729
  secure_file_priv= fs::system_complete(in_secure_file_priv);
 
730
}
727
731
 
728
732
static void check_limits_aii(uint64_t in_auto_increment_increment)
729
733
{
1272
1276
  N_("Pid file used by drizzled."))
1273
1277
  ("port-open-timeout", po::value<uint32_t>(&drizzled_bind_timeout)->default_value(0),
1274
1278
  N_("Maximum time in seconds to wait for the port to become free. "))
1275
 
  ("secure-file-priv", po::value<fs::path>(&secure_file_priv),
 
1279
  ("secure-file-priv", po::value<fs::path>(&secure_file_priv)->notifier(expand_secure_file_priv),
1276
1280
  N_("Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files "
1277
1281
     "within specified directory"))
1278
1282
  ("server-id", po::value<uint32_t>(&server_id)->default_value(0),