← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/mysql_ms.cc

  • Committer: lbieber
  • Date: 2010-10-07 15:39:23 UTC
  • mfrom: (1819.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007153923-e9rwa9ha5oyhjdc2
Merge Monty - Bug 655294: load_data() function returns null if file is invalid 
Merge Monty - Bug 655342: select into outfile creates a garbage file on no results
Merge Monty - Fixes the haildb build

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/mysql_ms.cc
56
56
}
57
57
 
58
58
#ifdef DRIZZLED
59
 
const char *ms_my_get_mysql_home_path()
 
59
const std::string ms_my_get_mysql_home_path()
60
60
{
61
 
        return drizzled::getDataHomeCatalog().c_str();
 
61
        return drizzled::getDataHomeCatalog().file_string();
62
62
}
63
63
 
64
64
bool ms_is_autocommit()
67
67
}
68
68
 
69
69
#else
70
 
const char *ms_my_get_mysql_home_path()
 
70
const std::string ms_my_get_mysql_home_path()
71
71
{
72
72
        return mysql_real_data_home;
73
73
}