Merge lp:~mordred/drizzle/boost-fs-path-work into lp:~drizzle-trunk/drizzle/development

[Monty Taylor]

A bunch of work cleaning up how paths are managed/handled.

[Monty Taylor (mordred)]

This was approved before, but I rebased and repushed under a different name.

[Lee Bieber (kalebral-deactivatedaccount)]

Fails with debug build

[lp:~mordred/drizzle/boost-fs-path-work]

1830. By Monty Taylor on 2010-10-07

Fixed an alarming issue in debug builds of pbmx. Oh well.

[Monty Taylor (mordred)]

Fixed the pbms issue.

=== modified file 'drizzled/data_home.h'
--- drizzled/data_home.h	2010-09-26 01:21:36 +0000
+++ drizzled/data_home.h	2010-10-06 07:38:58 +0000
@@ -20,15 +20,15 @@
 #ifndef DRIZZLED_DATA_HOME_H
 #define DRIZZLED_DATA_HOME_H
 
-#include <string>
+#include <boost/filesystem.hpp>
 
 namespace drizzled
 {
 
-std::string& getDataHome();
-std::string& getDataHomeCatalog();
-char *getDatadir();
-char **getDatadirPtr();
+extern boost::filesystem::path full_data_home;
+
+boost::filesystem::path& getDataHome();
+boost::filesystem::path& getDataHomeCatalog();
 
 } /* namespace drizzled */
 
 
=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2010-10-04 22:44:31 +0000
+++ drizzled/drizzled.cc	2010-10-06 07:38:58 +0000
@@ -232,8 +232,6 @@
 plugin::StorageEngine *heap_engine;
 plugin::StorageEngine *myisam_engine;
 
-char* opt_secure_file_priv= 0;
-
 bool calling_initgroups= false; /**< Used in SIGSEGV handler. */
 
 uint32_t drizzled_bind_timeout;
@@ -288,7 +286,14 @@
 time_t server_start_time;
 time_t flush_status_time;
 
-char drizzle_home[FN_REFLEN], pidfile_name[FN_REFLEN], system_time_zone[30];
+fs::path basedir(PREFIX);
+fs::path pid_file;
+fs::path secure_file_priv("");
+fs::path plugin_dir;
+fs::path system_config_dir(SYSCONFDIR);
+
+
+char system_time_zone[30];
 char *default_tz_name;
 char glob_hostname[FN_REFLEN];
 
@@ -336,7 +341,6 @@
 /* Static variables */
 
 int cleanup_done;
-static char *drizzle_home_ptr, *pidfile_name_ptr;
 
 passwd *user_info;
 
@@ -352,7 +356,6 @@
 
 static void drizzle_init_variables(void);
 static void get_options();
-static const char *get_relative_path(const char *path);
 static void fix_paths();
 
 static void usage(void);
@@ -369,34 +372,26 @@
 vector<string> unknown_options;
 vector<string> defaults_file_list;
 po::variables_map vm;
-char * data_dir_ptr;
+
+fs::path data_home(LOCALSTATEDIR);
+fs::path full_data_home(LOCALSTATEDIR);
 
 po::variables_map &getVariablesMap()
 {
   return vm;
 }
 
-std::string& getDataHome()
+fs::path& getDataHome()
 {
-  static string data_home(LOCALSTATEDIR);
   return data_home;
 }
 
-std::string& getDataHomeCatalog()
+fs::path& getDataHomeCatalog()
 {
-  static string data_home_catalog(getDataHome());
+  static fs::path data_home_catalog(getDataHome());
   return data_home_catalog;
 }
 
-char *getDatadir()
-{
-  return data_dir_ptr;
-}
-
-char **getDatadirPtr()
-{
-  return &data_dir_ptr;
-}
  
 /****************************************************************************
 ** Code to end drizzled
@@ -511,13 +506,10 @@
     return;
 
   table_cache_free();
-  set_var_free();
   free_charsets();
   module::Registry &modules= module::Registry::singleton();
   modules.shutdownModules();
   xid_cache_free();
-  if (opt_secure_file_priv)
-    free(opt_secure_file_priv);
 
   deinit_temporal_formats();
 
@@ -525,7 +517,7 @@
   google::protobuf::ShutdownProtobufLibrary();
 #endif
 
-  (void) unlink(pidfile_name);	// This may not always exist
+  (void) unlink(pid_file.file_string().c_str());	// This may not always exist
 
   if (print_message && server_start_time)
     errmsg_printf(ERRMSG_LVL_INFO, _(ER(ER_SHUTDOWN_COMPLETE)),internal::my_progname);
@@ -535,8 +527,6 @@
   COND_server_end.notify_all();
   LOCK_thread_count.unlock();
 
-  char **data_home_ptr= getDatadirPtr();
-  delete[](*data_home_ptr);
   /*
     The following lines may never be executed as the main thread may have
     killed us
@@ -716,15 +706,29 @@
     base_plugin_dir /= "plugin";
     base_plugin_dir /= ".libs";
   }
-  (void) internal::my_load_path(opt_plugin_dir, fs::path(fs::system_complete(base_plugin_dir)).file_string().c_str(), "");
-}
-
-static void notify_plugin_dir(string in_plugin_dir)
-{
-  if (not in_plugin_dir.empty())
-  {
-    (void) internal::my_load_path(opt_plugin_dir, in_plugin_dir.c_str(), drizzle_home);
-  }
+
+  if (plugin_dir.root_directory() == "")
+  {
+    fs::path full_plugin_dir(fs::system_complete(base_plugin_dir));
+    full_plugin_dir /= plugin_dir;
+    plugin_dir= full_plugin_dir;
+  }
+}
+
+static void notify_plugin_dir(fs::path in_plugin_dir)
+{
+  plugin_dir= in_plugin_dir;
+  if (plugin_dir.root_directory() == "")
+  {
+    fs::path full_plugin_dir(fs::system_complete(basedir));
+    full_plugin_dir /= plugin_dir;
+    plugin_dir= full_plugin_dir;
+  }
+}
+
+static void expand_secure_file_priv(fs::path in_secure_file_priv)
+{
+  secure_file_priv= fs::system_complete(in_secure_file_priv);
 }
 
 static void check_limits_aii(uint64_t in_auto_increment_increment)
@@ -906,17 +910,6 @@
   global_system_variables.max_sort_length= in_max_sort_length;
 }
 
-static void check_limits_mwlc(uint64_t in_min_examined_row_limit)
-{
-  global_system_variables.min_examined_row_limit= ULONG_MAX;
-  if (in_min_examined_row_limit > ULONG_MAX)
-  {
-    cout << N_("Error: Invalid Value for min_examined_row_limit");
-    exit(-1);
-  }
-  global_system_variables.min_examined_row_limit= in_min_examined_row_limit;
-}
-
 static void check_limits_osd(uint32_t in_optimizer_search_depth)
 {
   global_system_variables.optimizer_search_depth= 0;
@@ -1120,19 +1113,18 @@
        iter != defaults_file_list.end();
        ++iter)
   {
-    string file_location(vm["config-dir"].as<string>());
+    fs::path file_location(system_config_dir);
     if ((*iter)[0] != '/')
     {
       /* Relative path - add config dir */
-      file_location.push_back('/');
-      file_location.append(*iter);
+      file_location /= *iter;
     }
     else
     {
       file_location= *iter;
     }
 
-    ifstream input_defaults_file(file_location.c_str());
+    ifstream input_defaults_file(file_location.file_string().c_str());
     
     po::parsed_options file_parsed=
       po::parse_config_file(input_defaults_file, full_options, true);
@@ -1211,15 +1203,15 @@
     strncpy(glob_hostname, STRING_WITH_LEN("localhost"));
     errmsg_printf(ERRMSG_LVL_WARN, _("gethostname failed, using '%s' as hostname"),
                   glob_hostname);
-    strncpy(pidfile_name, STRING_WITH_LEN("drizzle"));
+    pid_file= "drizzle";
   }
   else
-    strncpy(pidfile_name, glob_hostname, sizeof(pidfile_name)-5);
-  strcpy(internal::fn_ext(pidfile_name),".pid");		// Add proper extension
-
-  std::string system_config_dir_drizzle(SYSCONFDIR);
-  system_config_dir_drizzle.append("/drizzle");
-
+  {
+    pid_file= glob_hostname;
+  }
+  pid_file.replace_extension(".pid");
+
+  system_config_dir /= "drizzle";
   std::string system_config_file_drizzle("drizzled.cnf");
 
   config_options.add_options()
@@ -1229,9 +1221,9 @@
   N_("Configuration file defaults are not used if no-defaults is set"))
   ("defaults-file", po::value<vector<string> >()->composing()->notifier(&compose_defaults_file_list),
    N_("Configuration file to use"))
-  ("config-dir", po::value<string>()->default_value(system_config_dir_drizzle),
+  ("config-dir", po::value<fs::path>(&system_config_dir),
    N_("Base location for config files"))
-  ("plugin-dir", po::value<string>()->notifier(&notify_plugin_dir),
+  ("plugin-dir", po::value<fs::path>(&plugin_dir)->notifier(&notify_plugin_dir),
   N_("Directory for plugins."))
   ;
 
@@ -1255,7 +1247,7 @@
   N_("Auto-increment columns are incremented by this"))
   ("auto-increment-offset", po::value<uint64_t>(&global_system_variables.auto_increment_offset)->default_value(1)->notifier(&check_limits_aio),
   N_("Offset added to Auto-increment columns. Used when auto-increment-increment != 1"))
-  ("basedir,b", po::value<string>(),
+  ("basedir,b", po::value<fs::path>(&basedir),
   N_("Path to installation directory. All paths are usually resolved "
      "relative to this."))
   ("chroot,r", po::value<string>(),
@@ -1265,7 +1257,7 @@
   ("completion-type", po::value<uint32_t>(&global_system_variables.completion_type)->default_value(0)->notifier(&check_limits_completion_type),
   N_("Default completion type."))
   ("core-file",  N_("Write core on errors."))
-  ("datadir", po::value<string>(),
+  ("datadir", po::value<fs::path>(&data_home),
   N_("Path to the database root."))
   ("default-storage-engine", po::value<string>(),
   N_("Set the default storage engine for tables."))
@@ -1279,11 +1271,11 @@
   N_("Set the language used for the month names and the days of the week."))
   ("log-warnings,W", po::value<string>(),
   N_("Log some not critical warnings to the log file."))  
-  ("pid-file", po::value<string>(),
+  ("pid-file", po::value<fs::path>(&pid_file),
   N_("Pid file used by drizzled."))
   ("port-open-timeout", po::value<uint32_t>(&drizzled_bind_timeout)->default_value(0),
   N_("Maximum time in seconds to wait for the port to become free. "))
-  ("secure-file-priv", po::value<string>(),
+  ("secure-file-priv", po::value<fs::path>(&secure_file_priv)->notifier(expand_secure_file_priv),
   N_("Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files "
      "within specified directory"))
   ("server-id", po::value<uint32_t>(&server_id)->default_value(0),
@@ -1339,7 +1331,7 @@
   N_("The number of bytes to use when sorting BLOB or TEXT values "
      "(only the first max_sort_length bytes of each value are used; the "
      "rest are ignored)."))
-  ("max-write-lock-count", po::value<uint64_t>(&max_write_lock_count)->default_value(ULONG_MAX)->notifier(&check_limits_mwlc),
+  ("max-write-lock-count", po::value<uint64_t>(&max_write_lock_count)->default_value(UINT64_MAX),
   N_("After this many write locks, allow some read locks to run in between."))
   ("min-examined-row-limit", po::value<uint64_t>(&global_system_variables.min_examined_row_limit)->default_value(0)->notifier(&check_limits_merl),
   N_("Don't log queries which examine less than min_examined_row_limit "
@@ -1426,9 +1418,10 @@
                               system_config_file_drizzle);
   }
 
-  string config_conf_d_location(vm["config-dir"].as<string>());
-  config_conf_d_location.append("/conf.d");
-  CachedDirectory config_conf_d(config_conf_d_location);
+  fs::path config_conf_d_location(system_config_dir);
+  config_conf_d_location /= "conf.d";
+
+  CachedDirectory config_conf_d(config_conf_d_location.file_string());
   if (not config_conf_d.fail())
   {
 
@@ -1442,10 +1435,9 @@
           && file_entry != "."
           && file_entry != "..")
       {
-        string the_entry(config_conf_d_location);
-        the_entry.push_back('/');
-        the_entry.append(file_entry);
-        defaults_file_list.push_back(the_entry);
+        fs::path the_entry(config_conf_d_location);
+        the_entry /= file_entry;
+        defaults_file_list.push_back(the_entry.file_string());
       }
     }
   }
@@ -1761,7 +1753,7 @@
   {"basedir", 'b',
    N_("Path to installation directory. All paths are usually resolved "
       "relative to this."),
-   (char**) &drizzle_home_ptr, (char**) &drizzle_home_ptr, 0, GET_STR, REQUIRED_ARG,
+   NULL, NULL, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
   {"chroot", 'r',
    N_("Chroot drizzled daemon during startup."),
@@ -1813,7 +1805,7 @@
    0, 0, 0},
   {"pid-file", OPT_PID_FILE,
    N_("Pid file used by drizzled."),
-   (char**) &pidfile_name_ptr, (char**) &pidfile_name_ptr, 0, GET_STR,
+   NULL, NULL, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"port-open-timeout", OPT_PORT_OPEN_TIMEOUT,
    N_("Maximum time in seconds to wait for the port to become free. "
@@ -1823,7 +1815,7 @@
   {"secure-file-priv", OPT_SECURE_FILE_PRIV,
    N_("Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files "
       "within specified directory"),
-   (char**) &opt_secure_file_priv, (char**) &opt_secure_file_priv, 0,
+   NULL, NULL, 0,
    GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"server-id",	OPT_SERVER_ID,
    N_("Uniquely identifies the server instance in the community of "
@@ -2121,9 +2113,7 @@
 static void drizzle_init_variables(void)
 {
   /* Things reset to zero */
-  drizzle_home[0]= pidfile_name[0]= 0;
   opt_tc_log_file= (char *)"tc.log";      // no hostname in tc_log file name !
-  opt_secure_file_priv= 0;
   cleanup_done= 0;
   dropping_tables= ha_open_options=0;
   test_flags.reset();
@@ -2141,8 +2131,6 @@
   character_set_filesystem= &my_charset_bin;
 
   /* Things with default values that are not zero */
-  drizzle_home_ptr= drizzle_home;
-  pidfile_name_ptr= pidfile_name;
   session_startup_options= (OPTION_AUTO_IS_NULL | OPTION_SQL_NOTES);
   refresh_version= 1L;	/* Increments on each reload */
   global_thread_id= 1UL;
@@ -2197,11 +2185,6 @@
   have_symlink=SHOW_OPTION_YES;
 #endif
 
-  const char *tmpenv;
-  if (!(tmpenv = getenv("MY_BASEDIR_VERSION")))
-    tmpenv = PREFIX;
-  (void) strncpy(drizzle_home, tmpenv, sizeof(drizzle_home)-1);
-  
   connection_count= 0;
 }
 
@@ -2213,19 +2196,9 @@
 static void get_options()
 {
 
-  if (vm.count("base-dir"))
-  {
-    strncpy(drizzle_home,vm["base-dir"].as<string>().c_str(),sizeof(drizzle_home)-1);
-  }
-
-  if (vm.count("datadir"))
-  {
-    getDataHome()= vm["datadir"].as<string>();
-  }
-  string &data_home_catalog= getDataHomeCatalog();
+  fs::path &data_home_catalog= getDataHomeCatalog();
   data_home_catalog= getDataHome();
-  data_home_catalog.push_back('/');
-  data_home_catalog.append("local");
+  data_home_catalog /= "local"; 
 
   if (vm.count("user"))
   {
@@ -2277,11 +2250,6 @@
     internal::my_use_symdir=0;
   }
 
-  if (vm.count("pid-file"))
-  {
-    strncpy(pidfile_name, vm["pid-file"].as<string>().c_str(), sizeof(pidfile_name)-1);
-  }
-
   if (vm.count("transaction-isolation"))
   {
     int type;
@@ -2329,61 +2297,15 @@
 }
 
 
-static const char *get_relative_path(const char *path)
-{
-  if (internal::test_if_hard_path(path) &&
-      (strncmp(path, PREFIX, strlen(PREFIX)) == 0) &&
-      strcmp(PREFIX,FN_ROOTDIR))
-  {
-    if (strlen(PREFIX) < strlen(path))
-      path+=(size_t) strlen(PREFIX);
-    while (*path == FN_LIBCHAR)
-      path++;
-  }
-  return path;
-}
-
-
 static void fix_paths()
 {
-  char buff[FN_REFLEN],*pos,rp_buff[PATH_MAX];
-  internal::convert_dirname(drizzle_home,drizzle_home,NULL);
-  /* Resolve symlinks to allow 'drizzle_home' to be a relative symlink */
-#if defined(HAVE_BROKEN_REALPATH)
-   internal::my_load_path(drizzle_home, drizzle_home, NULL);
-#else
-  if (!realpath(drizzle_home,rp_buff))
-    internal::my_load_path(rp_buff, drizzle_home, NULL);
-  rp_buff[FN_REFLEN-1]= '\0';
-  strcpy(drizzle_home,rp_buff);
-  /* Ensure that drizzle_home ends in FN_LIBCHAR */
-  pos= strchr(drizzle_home, '\0');
-#endif
-  if (pos[-1] != FN_LIBCHAR)
-  {
-    pos[0]= FN_LIBCHAR;
-    pos[1]= 0;
-  }
-  (void) internal::my_load_path(drizzle_home, drizzle_home,""); // Resolve current dir
-
-  fs::path pid_file_path(pidfile_name);
+  fs::path pid_file_path(pid_file);
   if (pid_file_path.root_path().string() == "")
   {
-    pid_file_path= fs::path(getDataHome());
-    pid_file_path /= pidfile_name;
-  }
-  strncpy(pidfile_name, pid_file_path.file_string().c_str(), sizeof(pidfile_name)-1);
-
-
-  const char *sharedir= get_relative_path(PKGDATADIR);
-  if (internal::test_if_hard_path(sharedir))
-    strncpy(buff,sharedir,sizeof(buff)-1);
-  else
-  {
-    strcpy(buff, drizzle_home);
-    strncat(buff, sharedir, sizeof(buff)-strlen(drizzle_home)-1);
-  }
-  internal::convert_dirname(buff,buff,NULL);
+    pid_file_path= getDataHome();
+    pid_file_path /= pid_file;
+  }
+  pid_file= pid_file_path;
 
   if (not opt_help)
   {
@@ -2397,7 +2319,7 @@
     }
     else if (tmp_string == NULL)
     {
-      drizzle_tmpdir.append(getDataHome());
+      drizzle_tmpdir.append(getDataHome().file_string());
       drizzle_tmpdir.push_back(FN_LIBCHAR);
       drizzle_tmpdir.append(GLOBAL_TEMPORARY_EXT);
     }
@@ -2425,18 +2347,6 @@
     }
   }
 
-  /*
-    Convert the secure-file-priv option to system format, allowing
-    a quick strcmp to check if read or write is in an allowed dir
-   */
-  if (vm.count("secure-file-priv"))
-  {
-    internal::convert_dirname(buff, vm["secure-file-priv"].as<string>().c_str(), NULL);
-    free(opt_secure_file_priv);
-    opt_secure_file_priv= strdup(buff);
-    if (opt_secure_file_priv == NULL)
-      exit(1);
-  }
 }
 
 } /* namespace drizzled */
 
=== modified file 'drizzled/file_exchange.h'
--- drizzled/file_exchange.h	2010-02-04 08:14:46 +0000
+++ drizzled/file_exchange.h	2010-10-06 07:38:58 +0000
@@ -40,7 +40,8 @@
   XXX: We never call destructor for objects of this class.
 */
 
-class file_exchange :public memory::SqlAlloc
+class file_exchange :
+  public memory::SqlAlloc
 {
 public:
   enum enum_filetype filetype; /* load XML, Added by Arnold & Erik */
 
=== modified file 'drizzled/function/str/load_file.cc'
--- drizzled/function/str/load_file.cc	2010-09-22 07:05:47 +0000
+++ drizzled/function/str/load_file.cc	2010-10-06 07:38:58 +0000
@@ -25,8 +25,14 @@
 #include <drizzled/session.h>
 #include "drizzled/internal/my_sys.h"
 
+#include <boost/filesystem.hpp>
+
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <iostream>
+
+namespace fs=boost::filesystem;
+using namespace std;
 
 namespace drizzled
 {
@@ -37,27 +43,49 @@
   String *file_name;
   int file;
   struct stat stat_info;
-  char path[FN_REFLEN];
 
   if (!(file_name= args[0]->val_str(str)))
-    goto err;
+  {
+    null_value = 1;
+    return(0);
+  }
 
-  (void) internal::fn_format(path, file_name->c_ptr(), getDataHome().c_str(), "",
-		   MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
+  fs::path target_path(fs::system_complete(getDataHomeCatalog()));
+  fs::path to_file(file_name->c_ptr());
+  if (not to_file.has_root_directory())
+  {
+    target_path /= to_file;
+  }
+  else
+  {
+    target_path= to_file;
+  }
 
   /* Read only allowed from within dir specified by secure_file_priv */
-  if (opt_secure_file_priv &&
-      strncmp(opt_secure_file_priv, path, strlen(opt_secure_file_priv)))
-    goto err;
+  if (not secure_file_priv.string().empty())
+  {
+    fs::path secure_file_path(fs::system_complete(secure_file_priv));
+    if (target_path.file_string().substr(0, secure_file_path.file_string().size()) != secure_file_path.file_string())
+    {
+      /* Read only allowed from within dir specified by secure_file_priv */
+      my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--secure-file-priv"); 
+      null_value = 1;
+      return 0;
+    }
+  }
 
-  if (stat(path, &stat_info))
+  if (stat(target_path.file_string().c_str(), &stat_info))
+  {
+    my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), file_name->c_ptr());
     goto err;
+  }
 
   if (!(stat_info.st_mode & S_IROTH))
   {
-    /* my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), file_name->c_ptr()); */
+    my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), file_name->c_ptr());
     goto err;
   }
+
   if (stat_info.st_size > (long) session.variables.max_allowed_packet)
   {
     push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
@@ -66,15 +94,25 @@
                         func_name(), session.variables.max_allowed_packet);
     goto err;
   }
+
+  if (stat_info.st_size == 0)
+  {
+    goto err;
+  }
+
   if (tmp_value.alloc((size_t)stat_info.st_size))
     goto err;
-  if ((file = internal::my_open(file_name->c_ptr(), O_RDONLY, MYF(0))) < 0)
+  if ((file = internal::my_open(target_path.file_string().c_str(), O_RDONLY, MYF(0))) < 0)
     goto err;
   if (internal::my_read(file, (unsigned char*) tmp_value.ptr(), (size_t)stat_info.st_size, MYF(MY_NABP)))
   {
     internal::my_close(file, MYF(0));
     goto err;
   }
+  if (strlen(tmp_value.ptr()) == 0)
+  {
+    goto err;
+  }
   tmp_value.length((size_t)stat_info.st_size);
   internal::my_close(file, MYF(0));
   null_value = 0;
 
=== modified file 'drizzled/main.cc'
--- drizzled/main.cc	2010-10-05 08:06:38 +0000
+++ drizzled/main.cc	2010-10-06 07:38:58 +0000
@@ -255,11 +255,11 @@
 
   if (not opt_help)
   {
-    if (chdir(getDataHome().c_str()))
+    if (chdir(getDataHome().file_string().c_str()))
     {
       errmsg_printf(ERRMSG_LVL_ERROR,
                     _("Data directory %s does not exist\n"),
-                    getDataHome().c_str());
+                    getDataHome().file_string().c_str());
       unireg_abort(1);
     }
     if (mkdir("local", 0700))
@@ -270,15 +270,11 @@
     {
       errmsg_printf(ERRMSG_LVL_ERROR,
                     _("Local catalog %s/local does not exist\n"),
-                    getDataHome().c_str());
+                    getDataHome().file_string().c_str());
       unireg_abort(1);
     }
-    /* TODO: This is a hack until we can properly support std::string in sys_var*/
-    char **data_home_ptr= getDatadirPtr();
-    fs::path full_data_home_path(fs::system_complete(fs::path(getDataHome())));
-    std::string full_data_home(full_data_home_path.file_string());
-    *data_home_ptr= new char[full_data_home.size()+1] ();
-    memcpy(*data_home_ptr, full_data_home.c_str(), full_data_home.size());
+
+    full_data_home= fs::system_complete(getDataHome());
     getDataHomeCatalog()= "./";
     getDataHome()= "../";
   }
@@ -319,7 +315,7 @@
     select_thread_in_use=0;
     (void) pthread_kill(signal_thread, SIGTERM);
 
-    (void) unlink(pidfile_name);	// Not needed anymore
+    (void) unlink(pid_file.file_string().c_str());	// Not needed anymore
 
     exit(1);
   }
 
=== modified file 'drizzled/module/library.cc'
--- drizzled/module/library.cc	2010-08-10 17:04:19 +0000
+++ drizzled/module/library.cc	2010-10-06 07:38:58 +0000
@@ -24,6 +24,8 @@
 #include <cerrno>
 #include <string>
 
+#include <boost/filesystem.hpp>
+
 #include "drizzled/plugin.h"
 #include "drizzled/definitions.h"
 #include "drizzled/error.h"
@@ -31,6 +33,7 @@
 #include "drizzled/module/library.h"
 
 using namespace std;
+namespace fs=boost::filesystem;
 
 namespace drizzled
 {
@@ -50,22 +53,19 @@
   */
 }
 
-const string module::Library::getLibraryPath(const string &plugin_name)
+const fs::path module::Library::getLibraryPath(const string &plugin_name)
 {
-  /* Compile dll path */
-  string dlpath;
-  dlpath.reserve(FN_REFLEN);
-  dlpath.append(opt_plugin_dir);
-  dlpath.append("/");
-  dlpath.append("lib");
-  dlpath.append(plugin_name);
-  dlpath.append("_plugin");
+  string plugin_lib_name("lib");
+  plugin_lib_name.append(plugin_name);
+  plugin_lib_name.append("_plugin");
 #if defined(TARGET_OS_OSX)
-  dlpath.append(".dylib");
+  plugin_lib_name.append(".dylib");
 #else
-  dlpath.append(".so");
+  plugin_lib_name.append(".so");
 #endif
-  return dlpath;
+
+  /* Compile dll path */
+  return plugin_dir / plugin_lib_name;
 }
 
 module::Library *module::Library::loadLibrary(const string &plugin_name, bool builtin)
@@ -102,7 +102,7 @@
   else
   {
   /* Open new dll handle */
-    dlpath.assign(Library::getLibraryPath(plugin_name));
+    dlpath.assign(Library::getLibraryPath(plugin_name).file_string());
     handle= dlopen(dlpath.c_str(), RTLD_NOW|RTLD_GLOBAL);
     if (handle == NULL)
     {
 
=== modified file 'drizzled/module/library.h'
--- drizzled/module/library.h	2010-05-15 18:23:34 +0000
+++ drizzled/module/library.h	2010-10-06 07:38:58 +0000
@@ -30,6 +30,8 @@
 
 #include <string>
 
+#include <boost/filesystem.hpp>
+
 namespace drizzled
 {
 namespace module
@@ -67,7 +69,7 @@
     return manifest;
   }
 
-  static const std::string getLibraryPath(const std::string &plugin_name);
+  static const boost::filesystem::path getLibraryPath(const std::string &plugin_name);
   static Library *loadLibrary(const std::string &plugin_name, bool builtin);
 };
 
 
=== modified file 'drizzled/module/loader.cc'
--- drizzled/module/loader.cc	2010-10-02 21:15:42 +0000
+++ drizzled/module/loader.cc	2010-10-06 07:38:58 +0000
@@ -75,7 +75,6 @@
 static PluginOptions opt_plugin_load;
 static PluginOptions opt_plugin_add;
 static PluginOptions opt_plugin_remove;
-char opt_plugin_dir[FN_REFLEN];
 const char *builtin_plugins= PANDORA_BUILTIN_LIST;
 
 /* Note that 'int version' must be the first field of every plugin
 
=== modified file 'drizzled/plugin.h'
--- drizzled/plugin.h	2010-09-27 18:14:40 +0000
+++ drizzled/plugin.h	2010-10-06 07:38:58 +0000
@@ -29,6 +29,7 @@
 #include "drizzled/lex_string.h"
 #include "drizzled/xid.h"
 #include <boost/program_options.hpp>
+#include <boost/filesystem.hpp>
 
 namespace drizzled
 {
@@ -46,7 +47,7 @@
 typedef drizzle_lex_string LEX_STRING;
 struct option;
 
-extern char opt_plugin_dir[FN_REFLEN];
+extern boost::filesystem::path plugin_dir;
 
 namespace plugin { class StorageEngine; }
 
 
=== modified file 'drizzled/select_export.h'
--- drizzled/select_export.h	2010-03-29 20:16:08 +0000
+++ drizzled/select_export.h	2010-10-06 07:38:58 +0000
@@ -29,7 +29,9 @@
 namespace drizzled
 {
 
-class select_export :public select_to_file {
+class select_export :
+  public select_to_file
+{
   uint32_t field_term_length;
   int field_sep_char,escape_char,line_sep_char;
   int field_term_char; // first char of FIELDS TERMINATED BY or MAX_INT
 
=== modified file 'drizzled/select_to_file.h'
--- drizzled/select_to_file.h	2010-02-04 08:14:46 +0000
+++ drizzled/select_to_file.h	2010-10-06 07:38:58 +0000
@@ -21,6 +21,8 @@
 #ifndef DRIZZLED_SELECT_TO_FILE_H
 #define DRIZZLED_SELECT_TO_FILE_H
 
+#include <boost/filesystem.hpp>
+
 namespace drizzled
 {
 
@@ -29,14 +31,15 @@
 typedef struct st_io_cache IO_CACHE;
 }
 
-class select_to_file : public select_result_interceptor
+class select_to_file :
+  public select_result_interceptor
 {
 protected:
   file_exchange *exchange;
   int file;
   internal::IO_CACHE *cache;
   ha_rows row_count;
-  char path[FN_REFLEN];
+  boost::filesystem::path path;
 
 public:
   select_to_file(file_exchange *ex);
 
=== modified file 'drizzled/session.cc'
--- drizzled/session.cc	2010-09-28 06:27:36 +0000
+++ drizzled/session.cc	2010-10-06 07:38:58 +0000
@@ -913,7 +913,7 @@
   {
     (void) end_io_cache(cache);
     (void) internal::my_close(file, MYF(0));
-    (void) internal::my_delete(path, MYF(0));		// Delete file on error
+    (void) internal::my_delete(path.file_string().c_str(), MYF(0));		// Delete file on error
     file= -1;
   }
 }
@@ -947,7 +947,7 @@
     (void) internal::my_close(file, MYF(0));
     file= -1;
   }
-  path[0]= '\0';
+  path= "";
   row_count= 0;
 }
 
@@ -957,7 +957,7 @@
     cache(static_cast<internal::IO_CACHE *>(memory::sql_calloc(sizeof(internal::IO_CACHE)))),
     row_count(0L)
 {
-  path[0]=0;
+  path= "";
 }
 
 select_to_file::~select_to_file()
@@ -991,31 +991,40 @@
 */
 
 
-static int create_file(Session *session, char *path, file_exchange *exchange, internal::IO_CACHE *cache)
+static int create_file(Session *session,
+                       fs::path &target_path,
+                       file_exchange *exchange,
+                       internal::IO_CACHE *cache)
 {
+  fs::path to_file(exchange->file_name);
   int file;
-  uint32_t option= MY_UNPACK_FILENAME | MY_RELATIVE_PATH;
-
-#ifdef DONT_ALLOW_FULL_LOAD_DATA_PATHS
-  option|= MY_REPLACE_DIR;			// Force use of db directory
-#endif
-
-  if (!internal::dirname_length(exchange->file_name))
+
+  if (not to_file.has_root_directory())
   {
-    strcpy(path, getDataHomeCatalog().c_str());
-    strncat(path, "/", 1);
-    if (! session->db.empty())
-      strncat(path, session->db.c_str(), FN_REFLEN-getDataHomeCatalog().size());
-    (void) internal::fn_format(path, exchange->file_name, path, "", option);
+    target_path= fs::system_complete(getDataHomeCatalog());
+    if (not session->db.empty())
+    {
+      int count_elements= 0;
+      for (fs::path::iterator iter= to_file.begin();
+           iter != to_file.end();
+           ++iter, ++count_elements)
+      { }
+
+      if (count_elements == 1)
+      {
+        target_path /= session->db;
+      }
+    }
+    target_path /= to_file;
   }
   else
-    (void) internal::fn_format(path, exchange->file_name, getDataHomeCatalog().c_str(), "", option);
+  {
+    target_path = exchange->file_name;
+  }
 
-  if (opt_secure_file_priv)
+  if (not secure_file_priv.string().empty())
   {
-    fs::path secure_file_path(fs::system_complete(fs::path(opt_secure_file_priv)));
-    fs::path target_path(fs::system_complete(fs::path(path)));
-    if (target_path.file_string().substr(0, secure_file_path.file_string().size()) != secure_file_path.file_string())
+    if (target_path.file_string().substr(0, secure_file_priv.file_string().size()) != secure_file_priv.file_string())
     {
       /* Write only allowed to dir or subdir specified by secure_file_priv */
       my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--secure-file-priv");
@@ -1023,19 +1032,19 @@
     }
   }
 
-  if (!access(path, F_OK))
+  if (!access(target_path.file_string().c_str(), F_OK))
   {
     my_error(ER_FILE_EXISTS_ERROR, MYF(0), exchange->file_name);
     return -1;
   }
   /* Create the file world readable */
-  if ((file= internal::my_create(path, 0666, O_WRONLY|O_EXCL, MYF(MY_WME))) < 0)
+  if ((file= internal::my_create(target_path.file_string().c_str(), 0666, O_WRONLY|O_EXCL, MYF(MY_WME))) < 0)
     return file;
   (void) fchmod(file, 0666);			// Because of umask()
   if (init_io_cache(cache, file, 0L, internal::WRITE_CACHE, 0L, 1, MYF(MY_WME)))
   {
     internal::my_close(file, MYF(0));
-    internal::my_delete(path, MYF(0));  // Delete file on error, it was just created
+    internal::my_delete(target_path.file_string().c_str(), MYF(0));  // Delete file on error, it was just created
     return -1;
   }
   return file;
@@ -1049,7 +1058,9 @@
   bool string_results= false, non_string_results= false;
   unit= u;
   if ((uint32_t) strlen(exchange->file_name) + NAME_LEN >= FN_REFLEN)
-    strncpy(path,exchange->file_name,FN_REFLEN-1);
+  {
+    path= exchange->file_name;
+  }
 
   /* Check if there is any blobs in data */
   {
@@ -1318,7 +1329,7 @@
   if (row_count++ > 1)
   {
     my_message(ER_TOO_MANY_ROWS, ER(ER_TOO_MANY_ROWS), MYF(0));
-    goto err;
+    return 1;
   }
   while ((item=li++))
   {
@@ -1326,17 +1337,15 @@
     if (!res)					// If NULL
     {
       if (my_b_write(cache,(unsigned char*) "",1))
-	goto err;
+        return 1;
     }
     else if (my_b_write(cache,(unsigned char*) res->ptr(),res->length()))
     {
-      my_error(ER_ERROR_ON_WRITE, MYF(0), path, errno);
-      goto err;
+      my_error(ER_ERROR_ON_WRITE, MYF(0), path.file_string().c_str(), errno);
+      return 1;
     }
   }
   return(0);
-err:
-  return(1);
 }
 
 
 
=== modified file 'drizzled/set_var.cc'
--- drizzled/set_var.cc	2010-09-29 16:49:08 +0000
+++ drizzled/set_var.cc	2010-10-06 07:38:58 +0000
@@ -86,7 +86,6 @@
 extern size_t my_thread_stack_size;
 
 class sys_var_pluginvar;
-static DYNAMIC_ARRAY fixed_show_vars;
 typedef map<string, sys_var *> SystemVariableMap;
 static SystemVariableMap system_variable_map;
 extern char *opt_drizzle_tmpdir;
@@ -135,7 +134,14 @@
 sys_auto_increment_offset(&vars, "auto_increment_offset",
                           &system_variables::auto_increment_offset);
 
-static sys_var_const_str       sys_basedir(&vars, "basedir", drizzle_home);
+static sys_var_fs_path sys_basedir(&vars, "basedir", basedir);
+static sys_var_fs_path sys_pid_file(&vars, "pid_file", pid_file);
+static sys_var_fs_path sys_plugin_dir(&vars, "plugin_dir", plugin_dir);
+
+static sys_var_size_t_ptr sys_thread_stack_size(&vars, "thread_stack",
+                                                      &my_thread_stack_size);
+static sys_var_uint32_t_ptr sys_back_log(&vars, "back_log", &back_log);
+
 static sys_var_session_uint64_t	sys_bulk_insert_buff_size(&vars, "bulk_insert_buffer_size",
                                                           &system_variables::bulk_insert_buff_size);
 static sys_var_session_uint32_t	sys_completion_type(&vars, "completion_type",
@@ -144,7 +150,7 @@
                                                     fix_completion_type);
 static sys_var_collation_sv
 sys_collation_server(&vars, "collation_server", &system_variables::collation_server, &default_charset_info);
-static sys_var_const_str_ptr       sys_datadir(&vars, "datadir", getDatadirPtr());
+static sys_var_fs_path       sys_datadir(&vars, "datadir", getDataHome());
 
 static sys_var_session_uint64_t	sys_join_buffer_size(&vars, "join_buffer_size",
                                                      &system_variables::join_buff_size);
@@ -198,8 +204,8 @@
                                                         false, fix_session_mem_root);
 static sys_var_readonly sys_tmpdir(&vars, "tmpdir", OPT_GLOBAL, SHOW_CHAR, get_tmpdir);
 
-static sys_var_const_str_ptr sys_secure_file_priv(&vars, "secure_file_priv",
-                                             &opt_secure_file_priv);
+static sys_var_fs_path sys_secure_file_priv(&vars, "secure_file_priv",
+                                            secure_file_priv);
 
 static sys_var_const_str_ptr sys_scheduler(&vars, "scheduler",
                                            (char**)&opt_scheduler);
@@ -307,21 +313,6 @@
 /* Global read-only variable containing hostname */
 static sys_var_const_str        sys_hostname(&vars, "hostname", glob_hostname);
 
-/*
-  Additional variables (not derived from sys_var class, not accessible as
-  @@varname in SELECT or SET). Sorted in alphabetical order to facilitate
-  maintenance - SHOW VARIABLES will sort its output.
-  TODO: remove this list completely
-*/
-
-#define FIXED_VARS_SIZE (sizeof(fixed_vars) / sizeof(drizzle_show_var))
-static drizzle_show_var fixed_vars[]= {
-  {"back_log",                (char*) &back_log,                SHOW_INT},
-  {"pid_file",                (char*) pidfile_name,             SHOW_CHAR},
-  {"plugin_dir",              (char*) opt_plugin_dir,           SHOW_CHAR},
-  {"thread_stack",            (char*) &my_thread_stack_size,    SHOW_INT},
-};
-
 bool sys_var::check(Session *, set_var *var)
 {
   var->save_result.uint64_t_value= var->value->val_int();
@@ -1562,23 +1553,20 @@
   SYNOPSIS
     enumerate_sys_vars()
     session         current thread
-    sorted      If TRUE, the system variables should be sorted
 
   RETURN VALUES
     pointer     Array of drizzle_show_var elements for display
     NULL        FAILURE
 */
 
-drizzle_show_var* enumerate_sys_vars(Session *session, bool)
+drizzle_show_var* enumerate_sys_vars(Session *session)
 {
-  int fixed_count= fixed_show_vars.elements;
-  int size= sizeof(drizzle_show_var) * (system_variable_map.size() + fixed_count + 1);
+  int size= sizeof(drizzle_show_var) * (system_variable_map.size() + 1);
   drizzle_show_var *result= (drizzle_show_var*) session->alloc(size);
 
   if (result)
   {
-    drizzle_show_var *show= result + fixed_count;
-    memcpy(result, fixed_show_vars.buffer, fixed_count * sizeof(drizzle_show_var));
+    drizzle_show_var *show= result;
 
     SystemVariableMap::const_iterator iter= system_variable_map.begin();
     while (iter != system_variable_map.end())
@@ -1587,7 +1575,7 @@
       show->name= var->getName().c_str();
       show->value= (char*) var;
       show->type= SHOW_SYS;
-      show++;
+      ++show;
       ++iter;
     }
 
@@ -1615,13 +1603,6 @@
 
   for (sys_var *var= vars.first; var; var= var->getNext(), count++) {};
 
-  if (my_init_dynamic_array(&fixed_show_vars, sizeof(drizzle_show_var),
-                            FIXED_VARS_SIZE + 64, 64))
-    goto error;
-
-  fixed_show_vars.elements= FIXED_VARS_SIZE;
-  memcpy(fixed_show_vars.buffer, fixed_vars, sizeof(fixed_vars));
-
   vars.last->setNext(NULL);
   if (mysql_add_sys_var_chain(vars.first, my_long_options))
     goto error;
@@ -1634,12 +1615,6 @@
 }
 
 
-void set_var_free()
-{
-  delete_dynamic(&fixed_show_vars);
-}
-
-
 /**
   Find a user set-table variable.
 
 
=== modified file 'drizzled/set_var.h'
--- drizzled/set_var.h	2010-09-29 16:49:08 +0000
+++ drizzled/set_var.h	2010-10-06 07:38:58 +0000
@@ -21,6 +21,7 @@
 #define DRIZZLED_SET_VAR_H
 
 #include <string>
+#include <boost/filesystem.hpp>
 
 #include "drizzled/function/func.h"
 #include "drizzled/function/set_user_var.h"
@@ -62,8 +63,9 @@
 extern const char *in_additional_cond;
 extern const char *in_having_cond;
 extern char glob_hostname[FN_REFLEN];
-extern char drizzle_home[FN_REFLEN];
-extern char pidfile_name[FN_REFLEN];
+extern boost::filesystem::path basedir;
+extern boost::filesystem::path pid_file;
+extern boost::filesystem::path secure_file_priv;
 extern char system_time_zone[30];
 extern char *opt_tc_log_file;
 extern uint64_t session_startup_options;
@@ -80,7 +82,6 @@
 extern uint32_t volatile thread_running;
 extern uint32_t volatile global_read_lock;
 extern bool opt_readonly;
-extern char* opt_secure_file_priv;
 extern char *default_tz_name;
 extern const char *opt_scheduler;
 
@@ -360,6 +361,44 @@
 };
 
 
+class sys_var_fs_path :
+  public sys_var
+{
+  const boost::filesystem::path &value;
+public:
+  sys_var_fs_path(sys_var_chain *chain,
+                  const char *name_arg,
+                  const boost::filesystem::path& value_arg) :
+    sys_var(name_arg),
+    value(value_arg)
+  {
+    chain_sys_var(chain);
+  }
+
+  inline void set(char *)
+  { }
+
+  bool check(Session *, set_var *)
+  {
+    return true;
+  }
+  bool update(Session *, set_var *)
+  {
+    return true;
+  }
+  SHOW_TYPE show_type() { return SHOW_CHAR; }
+  unsigned char *value_ptr(Session *, sql_var_t, const LEX_STRING *)
+  {
+    return (unsigned char*)(value.file_string().c_str());
+  }
+  bool check_update_type(Item_result)
+  {
+    return true;
+  }
+  bool check_default(sql_var_t) { return true; }
+  bool is_readonly() const { return true; }
+};
+
 class sys_var_const_str :public sys_var
 {
   char *value;					// Pointer to const value
@@ -912,8 +951,7 @@
 */
 
 int set_var_init();
-void set_var_free();
-drizzle_show_var* enumerate_sys_vars(Session *session, bool sorted);
+drizzle_show_var* enumerate_sys_vars(Session *session);
 void drizzle_add_plugin_sysvar(sys_var_pluginvar *var);
 void drizzle_del_plugin_sysvar();
 int mysql_add_sys_var_chain(sys_var *chain, struct option *long_options);
 
=== modified file 'drizzled/sql_load.cc'
--- drizzled/sql_load.cc	2010-10-02 21:15:42 +0000
+++ drizzled/sql_load.cc	2010-10-06 07:38:58 +0000
@@ -124,7 +124,6 @@
                 List<Item> &set_values,
                 enum enum_duplicates handle_duplicates, bool ignore)
 {
-  char name[FN_REFLEN];
   int file;
   Table *table= NULL;
   int error;
@@ -254,61 +253,62 @@
     return(true);
   }
 
-  {
-#ifdef DONT_ALLOW_FULL_LOAD_DATA_PATHS
-    ex->file_name+=dirname_length(ex->file_name);
-#endif
-    if (!internal::dirname_length(ex->file_name))
-    {
-      strcpy(name, getDataHomeCatalog().c_str());
-      strncat(name, "/", 1);
-      strncat(name, tdb, FN_REFLEN-getDataHomeCatalog().size());
-      (void) internal::fn_format(name, ex->file_name, name, "",
-		       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
-    }
-    else
-    {
-      (void) internal::fn_format(name, ex->file_name, getDataHomeCatalog().c_str(), "",
-		       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
-
-      if (opt_secure_file_priv)
-      {
-        fs::path secure_file_path(fs::system_complete(fs::path(opt_secure_file_priv)));
-        fs::path target_path(fs::system_complete(fs::path(name)));
-        if (target_path.file_string().substr(0, secure_file_path.file_string().size()) != secure_file_path.file_string())
-        {
-          /* Read only allowed from within dir specified by secure_file_priv */
-          my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--secure-file-priv");
-          return(true);
-        }
-      }
-
-      struct stat stat_info;
-      if (stat(name,&stat_info))
-      {
-        my_error(ER_FILE_NOT_FOUND, MYF(0), name, errno);
-	return(true);
-      }
-
-      // if we are not in slave thread, the cursor must be:
-      if (!((stat_info.st_mode & S_IROTH) == S_IROTH &&  // readable by others
-            (stat_info.st_mode & S_IFLNK) != S_IFLNK && // and not a symlink
-            ((stat_info.st_mode & S_IFREG) == S_IFREG ||
-             (stat_info.st_mode & S_IFIFO) == S_IFIFO)))
-      {
-	my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), name);
-	return(true);
-      }
-      if ((stat_info.st_mode & S_IFIFO) == S_IFIFO)
-	is_fifo = 1;
-    }
-    if ((file=internal::my_open(name,O_RDONLY,MYF(MY_WME))) < 0)
-    {
-      my_error(ER_CANT_OPEN_FILE, MYF(0), name, errno);
+  fs::path to_file(ex->file_name);
+  fs::path target_path(fs::system_complete(getDataHomeCatalog()));
+  if (not to_file.has_root_directory())
+  {
+    int count_elements= 0;
+    for (fs::path::iterator iter= to_file.begin();
+         iter != to_file.end();
+         ++iter, ++count_elements)
+    { }
+
+    if (count_elements == 1)
+    {
+      target_path /= tdb;
+    }
+    target_path /= to_file;
+  }
+  else
+  {
+    target_path= to_file;
+  }
+
+  if (not secure_file_priv.string().empty())
+  {
+    if (target_path.file_string().substr(0, secure_file_priv.file_string().size()) != secure_file_priv.file_string())
+    {
+      /* Read only allowed from within dir specified by secure_file_priv */
+      my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--secure-file-priv");
       return(true);
     }
   }
 
+  struct stat stat_info;
+  if (stat(target_path.file_string().c_str(), &stat_info))
+  {
+    my_error(ER_FILE_NOT_FOUND, MYF(0), target_path.file_string().c_str(), errno);
+    return(true);
+  }
+
+  // if we are not in slave thread, the cursor must be:
+  if (!((stat_info.st_mode & S_IROTH) == S_IROTH &&  // readable by others
+        (stat_info.st_mode & S_IFLNK) != S_IFLNK && // and not a symlink
+        ((stat_info.st_mode & S_IFREG) == S_IFREG ||
+         (stat_info.st_mode & S_IFIFO) == S_IFIFO)))
+  {
+    my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), target_path.file_string().c_str());
+    return(true);
+  }
+  if ((stat_info.st_mode & S_IFIFO) == S_IFIFO)
+    is_fifo = 1;
+
+
+  if ((file=internal::my_open(target_path.file_string().c_str(), O_RDONLY,MYF(MY_WME))) < 0)
+  {
+    my_error(ER_CANT_OPEN_FILE, MYF(0), target_path.file_string().c_str(), errno);
+    return(true);
+  }
   CopyInfo info;
   memset(&info, 0, sizeof(info));
   info.ignore= ignore;
@@ -395,14 +395,16 @@
     error= -1;				// Error on read
     goto err;
   }
-  snprintf(name, sizeof(name), ER(ER_LOAD_INFO), info.records, info.deleted,
+
+  char msg[FN_REFLEN];
+  snprintf(msg, sizeof(msg), ER(ER_LOAD_INFO), info.records, info.deleted,
 	   (info.records - info.copied), session->cuted_fields);
 
   if (session->transaction.stmt.hasModifiedNonTransData())
     session->transaction.all.markModifiedNonTransData();
 
   /* ok to client sent only after binlog write and engine commit */
-  session->my_ok(info.copied + info.deleted, 0, 0L, name);
+  session->my_ok(info.copied + info.deleted, 0, 0L, msg);
 err:
   assert(transactional_table || !(info.copied || info.deleted) ||
               session->transaction.stmt.hasModifiedNonTransData());
 
=== modified file 'drizzled/thr_lock.cc'
--- drizzled/thr_lock.cc	2010-10-02 21:15:42 +0000
+++ drizzled/thr_lock.cc	2010-10-06 07:38:58 +0000
@@ -89,7 +89,7 @@
 static enum thr_lock_type thr_upgraded_concurrent_insert_lock = TL_WRITE;
 
 
-uint64_t max_write_lock_count= ~(uint64_t) 0L;
+uint64_t max_write_lock_count= UINT64_MAX;
 
 /*
 ** For the future (now the thread specific cond is alloced by my_pthread.c)
 
=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2010-10-02 21:15:42 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2010-10-06 07:38:58 +0000
@@ -90,10 +90,12 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/program_options.hpp>
+#include <boost/filesystem.hpp>
 #include <drizzled/module/option_map.h>
 #include <iostream>
 
 namespace po= boost::program_options;
+namespace fs=boost::filesystem;
 using namespace std;
 
 /** @file ha_innodb.cc */
@@ -307,6 +309,7 @@
     
     /* These get strdup'd from vm variables */
     free(innobase_data_home_dir);
+    free(innobase_log_group_home_dir);
 
   }
 
@@ -1839,7 +1842,7 @@
   }
   else
   {
-    innobase_data_home_dir= strdup(getDataHome().c_str());
+    innobase_data_home_dir= strdup(getDataHome().file_string().c_str());
   }
 
   if (vm.count("fast-shutdown"))
@@ -2160,11 +2163,11 @@
 
   if (vm.count("log-group-home-dir"))
   {
-    innobase_log_group_home_dir= const_cast<char *>(vm["log-group-home-dir"].as<string>().c_str());
+    innobase_log_group_home_dir= strdup(vm["log-group-home-dir"].as<string>().c_str());
   }
   else
   {
-    innobase_log_group_home_dir = const_cast<char *>(getDataHome().c_str());
+    innobase_log_group_home_dir = strdup(getDataHome().file_string().c_str());
   }
 
 #ifdef UNIV_LOG_ARCHIVE
@@ -6435,7 +6438,6 @@
   ib_int64_t  n_rows;
   ulong   j;
   ulong   i;
-  char    path[FN_REFLEN];
   os_file_stat_t  stat_info;
 
   /* If we are forcing recovery at a high level, we will suppress
@@ -6479,15 +6481,14 @@
       prebuilt->trx->op_info = "returning various info to MySQL";
     }
 
-    snprintf(path, sizeof(path), "%s/%s%s",
-             getDataHomeCatalog().c_str(), ib_table->name, ".dfe");
-
-    internal::unpack_filename(path,path);
+    fs::path get_status_path(getDataHomeCatalog());
+    get_status_path /= ib_table->name;
+    fs::change_extension(get_status_path, "dfe");
 
     /* Note that we do not know the access time of the table,
     nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
 
-    if (os_file_get_status(path,&stat_info)) {
+    if (os_file_get_status(get_status_path.file_string().c_str(), &stat_info)) {
       stats.create_time = (ulong) stat_info.ctime;
     }
   }
 
=== modified file 'plugin/pbms/src/database_ms.cc'
--- plugin/pbms/src/database_ms.cc	2010-10-02 21:15:42 +0000
+++ plugin/pbms/src/database_ms.cc	2010-10-06 07:38:58 +0000
@@ -1259,7 +1259,7 @@
 	 * The database name is case sensitive here if the file system names are
 	 * case sensitive. This is desirable.
 	 */
-	path = CSPath::newPath(ms_my_get_mysql_home_path(), RETAIN(db_name));
+	path = CSPath::newPath(ms_my_get_mysql_home_path().c_str(), RETAIN(db_name));
 	push_(path);
 	if (create && !path->exists()) {
 		CSException::throwException(CS_CONTEXT, MS_ERR_UNKNOWN_DB, db_name->getCString());
@@ -1605,7 +1605,7 @@
 		bool create = false;
 		uint32_t db_id;
 		
-		path = createDatabasePath(ms_my_get_mysql_home_path(), CSString::newString(db_name), &db_id, &create);
+		path = createDatabasePath(ms_my_get_mysql_home_path().c_str(), CSString::newString(db_name), &db_id, &create);
 		
 		if (path) {
 			MSTransactionManager::dropDatabase(db_id);
@@ -1636,7 +1636,7 @@
 // 3: <database>/<table>
 bool MSDatabase::convertTablePathToIDs(const char *table_path, uint32_t *db_id, uint32_t *tab_id, bool create) 
 {
-	const char	*base = ms_my_get_mysql_home_path();
+	const char	*base = ms_my_get_mysql_home_path().c_str();
 	CSString	*table_url;
 	CSString	*db_path = NULL;
 	CSString	*db_name = NULL;
@@ -1736,7 +1736,7 @@
 	MSDatabase *db;
 	enter_();
 	
-	db = newDatabase(ms_my_get_mysql_home_path(), db_name, 0, create);
+	db = newDatabase(ms_my_get_mysql_home_path().c_str(), db_name, 0, create);
 	
 	if (db) {
 		push_(db);
 
=== modified file 'plugin/pbms/src/mysql_ms.cc'
--- plugin/pbms/src/mysql_ms.cc	2010-10-02 21:15:42 +0000
+++ plugin/pbms/src/mysql_ms.cc	2010-10-06 07:38:58 +0000
@@ -56,9 +56,9 @@
 }
 
 #ifdef DRIZZLED
-const char *ms_my_get_mysql_home_path()
+const std::string ms_my_get_mysql_home_path()
 {
-	return drizzled::getDataHomeCatalog().c_str();
+	return drizzled::getDataHomeCatalog().file_string();
 }
 
 bool ms_is_autocommit()
@@ -67,7 +67,7 @@
 }
 
 #else
-const char *ms_my_get_mysql_home_path()
+const std::string ms_my_get_mysql_home_path()
 {
 	return mysql_real_data_home;
 }
 
=== modified file 'plugin/pbms/src/mysql_ms.h'
--- plugin/pbms/src/mysql_ms.h	2010-10-02 21:15:42 +0000
+++ plugin/pbms/src/mysql_ms.h	2010-10-06 07:38:58 +0000
@@ -30,9 +30,11 @@
 #ifndef __MS_MYSQL_H__
 #define __MS_MYSQL_H__
 
+#include <string>
+
 void		*ms_my_get_thread();
 uint64_t	ms_my_1970_to_mysql_time(time_t t);
-const char	*ms_my_get_mysql_home_path();
+const std::string ms_my_get_mysql_home_path();
 void		ms_my_set_column_name(const char *table, uint16_t col_index, char *col_name);
 bool		ms_is_autocommit();
 
 
=== modified file 'plugin/pbms/src/pbmsdaemon_ms.cc'
--- plugin/pbms/src/pbmsdaemon_ms.cc	2010-06-24 19:00:02 +0000
+++ plugin/pbms/src/pbmsdaemon_ms.cc	2010-10-06 07:38:58 +0000
@@ -59,6 +59,6 @@
 	pbd_state = state;
 	
 	if (pbd_state == DaemonStartUp) { // In theory we could allow this to be set with a commandline option.
-		cs_make_absolute_path(PATH_MAX, pbd_home_dir, "pbms", ms_my_get_mysql_home_path()); 
+		cs_make_absolute_path(PATH_MAX, pbd_home_dir, "pbms", ms_my_get_mysql_home_path().c_str()); 
 	}
 }
 
=== modified file 'plugin/pbms/src/system_table_ms.cc'
--- plugin/pbms/src/system_table_ms.cc	2010-10-02 21:15:42 +0000
+++ plugin/pbms/src/system_table_ms.cc	2010-10-06 07:38:58 +0000
@@ -423,7 +423,7 @@
 	if (!db)
 		return false;
 		
-	cs_strcpy(PATH_MAX, path, ms_my_get_mysql_home_path());
+	cs_strcpy(PATH_MAX, path, ms_my_get_mysql_home_path().c_str());
 	cs_add_name_to_path(PATH_MAX, path, db);
 	
 	if (stat(path, &stat_info) == 0)
 
=== modified file 'plugin/pbxt/src/myxt_xt.cc'
--- plugin/pbxt/src/myxt_xt.cc	2010-10-02 21:15:42 +0000
+++ plugin/pbxt/src/myxt_xt.cc	2010-10-06 07:38:58 +0000
@@ -44,9 +44,11 @@
 #include <drizzled/charset_info.h>
 #include <plugin/myisam/my_handler.h>
 #include <plugin/myisam/myisampack.h>
+#include <boost/filesystem.hpp>
 //extern "C" struct charset_info_st *session_charset(Session *session);
 extern pthread_key_t THR_Session;
 
+namespace fs=boost::filesystem;
 using namespace drizzled;
 #else
 #include "mysql_priv.h"
@@ -2029,12 +2031,10 @@
 			message::Table::STANDARD);
 	}
 	else {
-		std::string n(getDataHomeCatalog());
-		n.append("/");
-		n.append(database_name);
-		n.append("/");
-		n.append(tab_file_name);
-		ident = new TableIdentifier(database_name, tab_name, n);
+          fs::path n(getDataHomeCatalog());
+          n /= database_name;
+          n /= tab_file_name;
+		ident = new TableIdentifier(database_name, tab_name, n.file_string());
 	}
 	
 	share = new TableShare(message::Table::STANDARD);
 
=== modified file 'plugin/pbxt/src/xt_defs.h'
--- plugin/pbxt/src/xt_defs.h	2010-10-02 21:15:42 +0000
+++ plugin/pbxt/src/xt_defs.h	2010-10-06 07:38:58 +0000
@@ -941,7 +941,8 @@
 
 #define my_pthread_setspecific_ptr(T, V)	pthread_setspecific(T, (void*) (V))
 
-#define mysql_real_data_home				::drizzled::getDataHomeCatalog().c_str()
+/* TODO: This is dangerous! */
+#define mysql_real_data_home				::drizzled::getDataHomeCatalog().file_string().c_str()
 
 #define mi_int4store(T,A)   { uint32_t def_temp= (uint32_t) (A);\
                               ((unsigned char*) (T))[3]= (unsigned char) (def_temp);\
 
=== modified file 'plugin/schema_engine/schema.cc'
--- plugin/schema_engine/schema.cc	2010-09-22 07:05:47 +0000
+++ plugin/schema_engine/schema.cc	2010-10-06 07:38:58 +0000
@@ -67,7 +67,7 @@
 
 void Schema::prime()
 {
-  CachedDirectory directory(getDataHomeCatalog(), CachedDirectory::DIRECTORY);
+  CachedDirectory directory(getDataHomeCatalog().file_string(), CachedDirectory::DIRECTORY);
   CachedDirectory::Entries files= directory.getEntries();
 
   mutex.lock();
 
=== modified file 'plugin/signal_handler/signal_handler.cc'
--- plugin/signal_handler/signal_handler.cc	2010-09-27 23:26:59 +0000
+++ plugin/signal_handler/signal_handler.cc	2010-10-06 07:38:58 +0000
@@ -28,6 +28,7 @@
 #include "drizzled/drizzled.h"
 
 #include <boost/thread/thread.hpp>
+#include <boost/filesystem.hpp>
 
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -41,7 +42,7 @@
 extern int cleanup_done;
 extern bool volatile abort_loop;
 extern bool volatile shutdown_in_progress;
-extern char pidfile_name[FN_REFLEN];
+extern boost::filesystem::path pid_file;
 /* Prototypes -> all of these should be factored out into a propper shutdown */
 extern void close_connections(void);
 extern std::bitset<12> test_flags;
@@ -88,8 +89,7 @@
   int file;
   char buff[1024];
 
-  assert(pidfile_name[0]);
-  if ((file = open(pidfile_name, O_CREAT|O_WRONLY|O_TRUNC, S_IRWXU|S_IRGRP|S_IROTH)) > 0)
+  if ((file = open(pid_file.file_string().c_str(), O_CREAT|O_WRONLY|O_TRUNC, S_IRWXU|S_IRGRP|S_IROTH)) > 0)
   {
     int length;
 
@@ -103,7 +103,7 @@
     (void)close(file); /* We can ignore the error, since we are going to error anyway at this point */
   }
   memset(buff, 0, sizeof(buff));
-  snprintf(buff, sizeof(buff)-1, "Can't start server: can't create PID file (%s)", pidfile_name);
+  snprintf(buff, sizeof(buff)-1, "Can't start server: can't create PID file (%s)", pid_file.file_string().c_str());
   sql_perror(buff);
   exit(1);
 }
 
=== modified file 'plugin/status_dictionary/variables.h'
--- plugin/status_dictionary/variables.h	2010-02-16 00:36:58 +0000
+++ plugin/status_dictionary/variables.h	2010-10-06 07:38:58 +0000
@@ -37,7 +37,7 @@
 
   drizzled::drizzle_show_var *getVariables()
   {
-    return enumerate_sys_vars(current_session, false); // Final value unused
+    return enumerate_sys_vars(current_session); // Final value unused
   }
 };
 
 
=== modified file 'tests/r/func_str.result'
--- tests/r/func_str.result	2010-08-18 21:57:15 +0000
+++ tests/r/func_str.result	2010-10-06 07:38:58 +0000
@@ -721,11 +721,7 @@
 1      
 drop table t1;
 select load_file("lkjlkj");
-load_file("lkjlkj")
-NULL
-select ifnull(load_file("lkjlkj"),"it's null");
-ifnull(load_file("lkjlkj"),"it's null")
-it's null
+ERROR HY000: The file 'lkjlkj' must be in the database directory or be readable by all
 CREATE TABLE t1 (a varchar(10));
 INSERT INTO t1 VALUES ('abc'), ('xyz');
 SELECT a, CONCAT(a,' ',a) AS c FROM t1
 
=== modified file 'tests/r/loaddata.result'
--- tests/r/loaddata.result	2010-09-23 01:53:13 +0000
+++ tests/r/loaddata.result	2010-10-06 07:38:58 +0000
@@ -150,10 +150,10 @@
 15	NULL	Ten
 show variables like "secure_file_pri%";
 Variable_name	Value
-secure_file_priv	MYSQLTEST_VARDIR/
+secure_file_priv	MYSQLTEST_VARDIR
 select @@secure_file_priv;
 @@secure_file_priv
-MYSQLTEST_VARDIR/
+MYSQLTEST_VARDIR
 set @@secure_file_priv= 0;
 ERROR HY000: Variable 'secure_file_priv' is a read only variable
 truncate table t1;
@@ -162,8 +162,7 @@
 select * from t1;
 a	b	c
 select load_file("DRIZZLE_TEST_DIR/t/loaddata.test");
-load_file("DRIZZLE_TEST_DIR/t/loaddata.test")
-NULL
+ERROR HY000: The Drizzle server is running with the --secure-file-priv option so it cannot execute this statement
 drop table t1, t2;
 create table t1(f1 int, f2 timestamp not null default current_timestamp);
 create table t2(f1 int);
 
=== modified file 'tests/r/outfile.result'
--- tests/r/outfile.result	2010-09-23 01:53:13 +0000
+++ tests/r/outfile.result	2010-10-06 07:38:58 +0000
@@ -3,10 +3,13 @@
 insert into t1 values("hello world"),("Hello mars"),(NULL);
 select load_file(concat(@tmpdir,"/outfile-test.1"));
 load_file(concat(@tmpdir,"/outfile-test.1"))
-NULL
+hello world
+Hello mars
+\N
+
 select load_file(concat(@tmpdir,"/outfile-test.2"));
 load_file(concat(@tmpdir,"/outfile-test.2"))
-NULL
+hello world
 select load_file(concat(@tmpdir,"/outfile-test.3"));
 load_file(concat(@tmpdir,"/outfile-test.3"))
 NULL
@@ -14,12 +17,12 @@
 ERROR HY000: File '../../tmp/outfile-test.2' already exists
 ERROR HY000: File '../../tmp/outfile-test.3' already exists
 select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
-load_file(concat(@tmpdir,"/outfile-test.not-exist"))
-NULL
+ERROR HY000: The file '../../tmp/outfile-test.not-exist' must be in the database directory or be readable by all
 drop table t1;
 select load_file(concat(@tmpdir,"/outfile-test.4"));
 load_file(concat(@tmpdir,"/outfile-test.4"))
-NULL
+1
+
 CREATE TABLE t1 (a INT);
 EXPLAIN 
 SELECT *
 
=== modified file 'tests/t/func_str.test'
--- tests/t/func_str.test	2010-08-26 21:56:15 +0000
+++ tests/t/func_str.test	2010-10-06 07:38:58 +0000
@@ -469,12 +469,9 @@
 --disable_metadata
 drop table t1;
 
-#
-# Bug #10418: LOAD_FILE does not behave like in manual if file does not exist
-#
 
+--error ER_TEXTFILE_NOT_READABLE
 select load_file("lkjlkj");
-select ifnull(load_file("lkjlkj"),"it's null");
 
 #
 # Bug#18243: REVERSE changes its argument
 
=== modified file 'tests/t/loaddata.test'
--- tests/t/loaddata.test	2010-09-23 01:53:13 +0000
+++ tests/t/loaddata.test	2010-10-06 07:38:58 +0000
@@ -135,8 +135,8 @@
 eval load data infile '$DRIZZLE_TEST_DIR/t/loaddata.test' into table t1;
 select * from t1;
 
-# Test "load_file" returns NULL
 --replace_result $DRIZZLE_TEST_DIR DRIZZLE_TEST_DIR
+--error ER_OPTION_PREVENTS_STATEMENT
 eval select load_file("$DRIZZLE_TEST_DIR/t/loaddata.test");
 
 # cleanup
 
=== modified file 'tests/t/outfile.test'
--- tests/t/outfile.test	2010-09-23 01:53:13 +0000
+++ tests/t/outfile.test	2010-10-06 07:38:58 +0000
@@ -38,6 +38,7 @@
 --error ER_FILE_EXISTS_ERROR
 eval select * into dumpfile "../../tmp/outfile-test.3" from t1;
 enable_query_log;
+--error ER_TEXTFILE_NOT_READABLE
 select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
 --remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.1
 --remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.2
@@ -48,6 +49,7 @@
 disable_query_log;
 eval select 1 into outfile "../../tmp/outfile-test.4";
 enable_query_log;
+--replace_result $DRIZZLE_TEST_DIR DRIZZLE_TEST_DIR
 select load_file(concat(@tmpdir,"/outfile-test.4"));
 --remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4