← 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: Brian Aker
  • Date: 2010-10-09 17:44:13 UTC
  • mto: This revision was merged to the branch mainline in revision 1853.
  • Revision ID: brian@tangent.org-20101009174413-4cs0q58kw0fjd45y
First pass through adding back user_locks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/mysql_ms.cc
1
 
/* Copyright (C) 2008 PrimeBase Technologies GmbH, Germany
 
1
/* Copyright (c) 2008 PrimeBase Technologies GmbH, Germany
2
2
 *
3
3
 * PrimeBase Media Stream for MySQL
4
4
 *
29
29
 
30
30
 
31
31
#ifdef DRIZZLED
32
 
#include <config.h>
 
32
#include "config.h"
33
33
#include <drizzled/common.h>
34
34
#include <drizzled/data_home.h>
35
35
#include <drizzled/current_session.h>
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().file_string().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
}