← 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: Lee Bieber
  • Date: 2010-10-22 16:47:38 UTC
  • mfrom: (1841.1.7 drizzle_pbms)
  • Revision ID: kalebral@gmail.com-20101022164738-vv8w22b8towpb307
Merge Barry - fix bug 657830: PBMS build failure in GCC 4.5

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 std::string ms_my_get_mysql_home_path()
 
59
const char *ms_my_get_mysql_home_path()
60
60
{
61
 
        return drizzled::getDataHomeCatalog().file_string();
 
61
        return drizzled::getDataHomeCatalog().file_string().c_str();
62
62
}
63
63
 
64
64
bool ms_is_autocommit()
67
67
}
68
68
 
69
69
#else
70
 
const std::string ms_my_get_mysql_home_path()
 
70
const char *ms_my_get_mysql_home_path()
71
71
{
72
72
        return mysql_real_data_home;
73
73
}