~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cached_directory.h

Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
86
86
   * @param[in] File extensions to allow
87
87
   */
88
88
  CachedDirectory(const std::string& in_path, std::set<std::string>& allowed_exts);
89
 
  CachedDirectory(const std::string& in_path, enum CachedDirectory::FILTER filter);
 
89
  CachedDirectory(const std::string& in_path, enum CachedDirectory::FILTER filter, bool use_full_path= false);
90
90
 
91
91
  /**
92
92
   * Destructor.  Cleans up any resources we've taken 
131
131
private:
132
132
  std::string path; ///< Path to the directory
133
133
  int error; ///< Error code stored from various syscalls
 
134
  bool use_full_path;
134
135
  Entries entries; ///< Entries in the directory
135
136
 
136
137
  /**