← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/myxt_xt.cc

  • Committer: Monty Taylor
  • Date: 2010-10-05 18:58:54 UTC
  • mto: (1819.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1820.
  • Revision ID: mordred@inaugust.com-20101005185854-5aj3ui8csyp50hlx
Made data_home be fs::path natively.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/myxt_xt.cc
44
44
#include <drizzled/charset_info.h>
45
45
#include <plugin/myisam/my_handler.h>
46
46
#include <plugin/myisam/myisampack.h>
 
47
#include <boost/filesystem.hpp>
47
48
//extern "C" struct charset_info_st *session_charset(Session *session);
48
49
extern pthread_key_t THR_Session;
49
50
 
 
51
namespace fs=boost::filesystem;
50
52
using namespace drizzled;
51
53
#else
52
54
#include "mysql_priv.h"
2029
2031
                        message::Table::STANDARD);
2030
2032
        }
2031
2033
        else {
2032
 
                std::string n(getDataHomeCatalog());
2033
 
                n.append("/");
2034
 
                n.append(database_name);
2035
 
                n.append("/");
2036
 
                n.append(tab_file_name);
2037
 
                ident = new TableIdentifier(database_name, tab_name, n);
 
2034
          fs::path n(getDataHomeCatalog());
 
2035
          n /= database_name;
 
2036
          n /= tab_file_name;
 
2037
                ident = new TableIdentifier(database_name, tab_name, n.file_string());
2038
2038
        }
2039
2039
        
2040
2040
        share = new TableShare(message::Table::STANDARD);