database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Justin Swanhart
2016-06-01 17:30:57 -04:00
parent f16c8a63e3 84eeae5a34
commit be45f0a40f
258 changed files with 1875 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/execplan/calpontsystemcatalog.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

6
dbcon/execplan/tdriver-sm.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -148,7 +148,7 @@ public:
void destroySemaphores()
{
key_t semkey;
char* semseed = "/usr/local/MariaDB/Columnstore/etc/Calpont.xml";
char* semseed = "/usr/local/mariadb/columnstore/etc/Calpont.xml";
int sems, err;
// semkey = ftok(semseed, 0x2149bdd2); // these things must match in the SM constructor
@ -166,7 +166,7 @@ public:
void destroyShmseg()
{
key_t shmkey;
char* shmseed = "/usr/local/MariaDB/Columnstore/etc/Calpont.xml";
char* shmseed = "/usr/local/mariadb/columnstore/etc/Calpont.xml";
int shms, err;
// shmkey = ftok(shmseed, 0x2149bdd2); // these things much match in the SM constructor

4
dbcon/execplan/tdriver.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -1082,7 +1082,7 @@ public:
int oid, oidBase;
// fake out the objmgr...
setenv("CALPONT_CONFIG_FILE", "/usr/local/MariaDB/Columnstore/etc/Calpont.xml", 1);
setenv("CALPONT_CONFIG_FILE", "/usr/local/mariadb/columnstore/etc/Calpont.xml", 1);
Config* cf = Config::makeConfig();
cf->setConfig("OIDManager", "OIDBitmapFile", "./oidbitmap");