← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge Joe, plus I updated the tests.

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
 *
14
14
 *
15
15
 * You should have received a copy of the GNU General Public License
16
16
 * along with this program; if not, write to the Free Software
17
 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
17
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
 *
19
19
 * Original author: Paul McCullagh
20
20
 * Continued development: Barry Leslie
41
41
#include "cslib/CSGlobal.h"
42
42
#include "cslib/CSException.h"
43
43
#include "defs_ms.h"
 
44
#include "defs_ms.h"
44
45
#include "mysql_ms.h"
45
46
 
46
47
/* Note: 'new' used here is NOT CSObject::new which is a DEBUG define*/
58
59
#ifdef DRIZZLED
59
60
const char *ms_my_get_mysql_home_path()
60
61
{
61
 
        return drizzled::getDataHomeCatalog().file_string().c_str();
 
62
        return drizzled::data_home;
62
63
}
63
64
 
64
65
bool ms_is_autocommit()